This commit was manufactured by cvs2svn to create branch 'R3_2_2_patches'.
diff --git a/features/org.eclipse.jst.common_core.feature.patch/.project b/features/org.eclipse.jst.common_core.feature.patch/.project
deleted file mode 100644
index 4e28137..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common_core.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.jst.common_core.feature.patch/build.properties b/features/org.eclipse.jst.common_core.feature.patch/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.jst.common_core.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.jst.common_core.feature.patch/buildnotes_org.eclipse.jst.common_core.feature.patch.html b/features/org.eclipse.jst.common_core.feature.patch/buildnotes_org.eclipse.jst.common_core.feature.patch.html
deleted file mode 100644
index 4c38cec..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/buildnotes_org.eclipse.jst.common_core.feature.patch.html
+++ /dev/null
@@ -1,19 +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>Web Tools Platform Patch Build Notes</title>
-</head>
-
-<body>
-
-<h1>WTP 3.0.5 Patches</h1>
-
-<p>Bug <a href='https://bugs.eclipse.org/288543'>288543</a>. Classpath container facet runtime mapping can become out of sync</p>
-<p>Bug <a href='https://bugs.eclipse.org/289203'>289203</a>. Facet classpath utility not properly migrating legacy projects</p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.common_core.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.common_core.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.common_core.feature.patch/epl-v10.html b/features/org.eclipse.jst.common_core.feature.patch/epl-v10.html
deleted file mode 100644
index e06ad62..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,262 +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">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<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.jst.common_core.feature.patch/feature.properties b/features/org.eclipse.jst.common_core.feature.patch/feature.properties
deleted file mode 100644
index 1752c09..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/feature.properties
+++ /dev/null
@@ -1,148 +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.jst.common_core.feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=\
-The bugs and fixes are described in the following bugzilla entries:\n\
-\n\
-Bug https://bugs.eclipse.org/288543 Classpath container facet runtime mapping can become out of sync\n\
-Bug https://bugs.eclipse.org/289203 Facet classpath utility not properly migrating legacy projects\n\
-\n\
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 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\
-August, 2008\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.common_core.feature.patch/feature.xml b/features/org.eclipse.jst.common_core.feature.patch/feature.xml
deleted file mode 100644
index 5bac988..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.common_core.feature.patch"
- label="%featureName"
- version="3.0.2.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.jst.common_core.feature" version="3.0.2.v200809102124-2518s733I3G395I75" patch="true"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.common.project.facet.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.common_core.feature.patch/license.html b/features/org.eclipse.jst.common_core.feature.patch/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.jst.common_core.feature.patch/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index f6f691d..8455f40 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -4,20 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.0.5 Patches</title>
+<title>WTP 3.2.1 Patches</title>
</head>
<body>
-<h1>WTP 3.0.5 Patches</h1>
+<h1>WTP 3.2.2 Patches</h1>
<h2>org.eclipse.wst.common_core.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/267367'>267367</a>. should disable deferred DOM expansion in parser used by DOMUtilities</p>
-<p>Bug <a href='https://bugs.eclipse.org/279175'>279175</a>. An internal error occurred during: "Validation TestEJB".</p>
-<p>Bug <a href='https://bugs.eclipse.org/283634'>283634</a>. ProjectResourceSetImpl getResources() cause deadlock with call to SynchronizedResourcesEList</p>
-<p>Bug <a href='https://bugs.eclipse.org/284041'>284041</a>. EOF in Validation Framework</p>
-<p>Bug <a href='https://bugs.eclipse.org/285071'>285071</a>. ComponentResolver does not resolve absolute references to the context root</p>
-<p>Bug <a href='https://bugs.eclipse.org/286403'>286403</a>. Validation Framework doesn't work after facet change</p>
+<p>Bug <a href='https://bugs.eclipse.org/325991'>325991</a>. Regression: child projects not targeted to parent project's runtime</p>
+
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index eff5744..e7e5724 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -27,16 +27,11 @@
description=\
Contains fixes described in the following bugillia(s):\n\
\n\
-Bug https://bugs.eclipse.org/267367 should disable deferred DOM expansion in parser used by DOMUtilities\n\
-Bug https://bugs.eclipse.org/279175 An internal error occurred during: "Validation TestEJB".\n\
-Bug https://bugs.eclipse.org/283634 ProjectResourceSetImpl getResources() cause deadlock with call to SynchronizedResourcesEList\n\
-Bug https://bugs.eclipse.org/284041 EOF in Validation Framework\n\
-Bug https://bugs.eclipse.org/285071 ComponentResolver does not resolve absolute references to the context root\n\
-Bug https://bugs.eclipse.org/286403 Validation Framework doesn't work after facet change\n\
+Bug https://bugs.eclipse.org/325991 - Regression: child projects not targeted to parent project's runtime\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
+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\
@@ -53,8 +48,8 @@
# "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\
-September, 2008\n\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
\n\
Usage Of Content\n\
\n\
@@ -62,42 +57,38 @@
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\
+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\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+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.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\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? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - 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\
@@ -106,47 +97,77 @@
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\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+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\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - 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\
+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,\n\
-and re-export of encryption software, to see if this is permitted.\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 Sun Microsystems, Inc. in the United States, other countries, or both.\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_core.feature.patch/feature.xml b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
index 8955033..a272811 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common_core.feature.patch"
label="%featureName"
- version="3.0.5.qualifier"
+ version="3.2.2.qualifier"
provider-name="%providerName">
<description>
@@ -18,35 +18,14 @@
</license>
<requires>
- <import feature="org.eclipse.wst.common_core.feature" version="3.0.5.v200903300951-7C7_EVVE_EkMNwQ7VAQ9ik" patch="true"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ" patch="true"/>
</requires>
<plugin
- id="org.eclipse.wst.common.emf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.wst.common.modulecore"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.wst.validation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/features/org.eclipse.wst.common_core.feature.patch/license.html b/features/org.eclipse.wst.common_core.feature.patch/license.html
index 2347060..c184ca3 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/license.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/license.html
@@ -1,93 +1,107 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
+<?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>
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
- <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>)
+<h3>Usage Of Content</h3>
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
+<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>
- <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>)
+<h3>Applicable Licenses</h3>
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.jem.util/.classpath b/plugins/org.eclipse.jem.util/.classpath
deleted file mode 100644
index a988941..0000000
--- a/plugins/org.eclipse.jem.util/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jemutil"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="src" path="jemutil-nonworkbnech"/>
- <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.jem.util/.cvsignore b/plugins/org.eclipse.jem.util/.cvsignore
deleted file mode 100644
index e043cc4..0000000
--- a/plugins/org.eclipse.jem.util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-build.xml
-javaCompiler...args
diff --git a/plugins/org.eclipse.jem.util/.options b/plugins/org.eclipse.jem.util/.options
deleted file mode 100644
index 0565417..0000000
--- a/plugins/org.eclipse.jem.util/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.util/debug/logtrace=false
-org.eclipse.jem.util/debug/logtracefile=false
-org.eclipse.jem.util/debug/loglevel=WARNING
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/.project b/plugins/org.eclipse.jem.util/.project
deleted file mode 100644
index e0e4120..0000000
--- a/plugins/org.eclipse.jem.util/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.util</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.jem.util/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 02c2954..0000000
--- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:15:45 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cb579cc..0000000
--- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,292 +0,0 @@
-#Tue Jul 31 20:39:48 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.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=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-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.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=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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.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.unusedLocal=error
-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=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6c8e1bc..0000000
--- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:19 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.util/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fb46b28..0000000
--- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri May 13 10:10:04 EDT 2005
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=2
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=2
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=2
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
deleted file mode 100644
index 3609c55..0000000
--- a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.util; singleton:=true
-Bundle-Version: 2.0.102.qualifier
-Bundle-Activator: org.eclipse.jem.util.plugin.JEMUtilPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.util.emf.workbench;x-friends:="org.eclipse.jem.beaninfo",
- org.eclipse.jem.internal.util.emf.workbench.nature;x-internal:=true,
- org.eclipse.jem.internal.util.emf.workbench.nls;x-internal:=true,
- org.eclipse.jem.util,
- org.eclipse.jem.util.emf.workbench,
- org.eclipse.jem.util.emf.workbench.nature,
- org.eclipse.jem.util.logger,
- org.eclipse.jem.util.logger.proxy,
- org.eclipse.jem.util.logger.proxyrender,
- org.eclipse.jem.util.plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.perfmsr.core;bundle-version="1.0.0";resolution:=optional,
- com.ibm.icu;bundle-version="[3.8.1.1,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jem.util/PERFMSR_README.txt b/plugins/org.eclipse.jem.util/PERFMSR_README.txt
deleted file mode 100644
index ea51258..0000000
--- a/plugins/org.eclipse.jem.util/PERFMSR_README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.perfmsr.core code can be found in the perfmsr.jar loaded as binary in this
-project. Since this is optional, we needed to be able to compile without the true
-plugin being available. So we created the stub jar containing just what we needed.
-
-If there is a need to change anything in the stub jar, you will need to checkout
-the folder org.eclipse.jem.util/org.eclipse.perfmsr.core.stub. This will then
-be a separate project. You can then make the changes there, and then following the
-README in that project to create and commit the changes.
-
-The jar is in this project's classpath, but it is not exported and is not in
-the plugin.xml or build.properties. This means it will be available for compilation
-but it won't show up in the runtime workbench.
\ No newline at end of file
diff --git "a/plugins/org.eclipse.jem.util/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041" "b/plugins/org.eclipse.jem.util/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041"
deleted file mode 100644
index 718e94a..0000000
--- "a/plugins/org.eclipse.jem.util/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041"
+++ /dev/null
@@ -1,8 +0,0 @@
-Do not include a new dependency plugin to the MANIFEST for this plugind!!!
-
-The reason for this is that this plugin is also executed outside of Eclipse framework, such IBM Websphere Application Server (c) IBM. We cannot add
-new dependencies to the plugin because the current set is considered to be API. Adding a new set without consulting those users would break
-them.
-
-The external API is anything in the jemutil-nonworkbench folder. If it is only for a class in the other source folder(s) it may be OK since they would not be
-using that code. But it would be best to consult with them first.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/about.html b/plugins/org.eclipse.jem.util/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem.util/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/build.properties b/plugins/org.eclipse.jem.util/build.properties
deleted file mode 100644
index aa0d851..0000000
--- a/plugins/org.eclipse.jem.util/build.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-bin.includes = plugin.xml,\
- .options,\
- about.html,\
- plugin.properties,\
- META-INF/,\
- .
-src.includes = schema/,\
- about.html
-output.. = bin/
-source.. = jemutil/,\
- property_files/,\
- jemutil-nonworkbnech/
-jars.compile.order = .
-extra.. = ./org.eclipse.perfmsr.core.stub/perfmsr.jar
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java
deleted file mode 100644
index f50bae7..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-
-/**
- * This class should be used when logging information which should be grouped together. Instead of creating a new instance of this class every time it
- * is needed, for performance reasons, create an instance and reuse it.
- * <p>
- * Currently the only fields that are logged are the {@link #getText()} and {@link #getTargetException()}.
- *
- * @since 1.0.0
- */
-public class LogEntry {
-
- private int _executionMap = 0;
-
- private Throwable _caughtException = null;
-
- private String _propertiesFileName = null;
-
- private String localeOfOrigin = null;
-
- private String sourceIdentifier;
-
- private String elapsedTime;
-
- private String text;
-
- private String messageTypeIdentifier;
-
- /**
- * The file name parameter must be a name which can be used by ResourceBundle to load the string from the .properties file. The parameter must not
- * be null or the empty string.
- *
- * @param propertiesFileName
- *
- * @since 1.0.0
- */
- public LogEntry(String propertiesFileName) {
- setPropertiesFileName(propertiesFileName);
- }
-
- /**
- * Default Constructor
- */
- public LogEntry() {
- }
-
- /**
- * Get execution map
- *
- * @return execution map
- *
- * @since 1.0.0
- */
- public int getExecutionMap() {
- return _executionMap;
- }
-
- /**
- * Get the properties file name
- *
- * @return properties file name or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getPropertiesFileName() {
- return _propertiesFileName;
- }
-
- /**
- * Get target exception
- *
- * @return target exception or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public Throwable getTargetException() {
- return _caughtException;
- }
-
- /**
- * Get locale of origin
- *
- * @return locale of origin or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getLocaleOfOrigin() {
- return localeOfOrigin;
- }
-
- /**
- * Get source identifier.
- *
- * @return source identifier or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getSourceidentifier() {
- return sourceIdentifier;
- }
-
- /**
- * Get elapsed time
- *
- * @return elapsed time
- *
- * @since 1.0.0
- */
- public String getElapsedTime() {
- return elapsedTime;
- }
-
- /**
- * Get the message type identifier
- *
- * @return message type identifier or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getMessageTypeIdentifier() {
- return messageTypeIdentifier;
- }
-
- /**
- * Set execution map
- *
- * @param map
- *
- * @since 1.0.0
- */
- public void setExecutionMap(int map) {
- _executionMap = map;
- }
-
- /**
- * Set properties file name
- *
- * @param fName
- *
- * @since 1.0.0
- */
- public void setPropertiesFileName(String fName) {
- _propertiesFileName = fName;
- }
-
- /**
- * Set target exception
- *
- * @param exc
- *
- * @since 1.0.0
- */
- public void setTargetException(Throwable exc) {
- _caughtException = exc;
- }
-
- /**
- * Append stacktrace of current stack (at the time of call to this method) to the text buffer.
- *
- *
- * @since 1.0.0
- */
- public void appendStackTrace() {
- // Grab the stack trace from the Thread ...
- ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
- PrintWriter printWriter = new PrintWriter(byteOutput);
- // Can't call Thread.dumpStack() because it doesn't take a writer as input.
- // Copy its mechanism instead.
- new Exception("Stack trace").printStackTrace(printWriter); //$NON-NLS-1$
- printWriter.flush();
-
- // and update the text to the LogEntry's text.
- StringBuffer buffer = new StringBuffer();
- buffer.append(getText());
- buffer.append("\n"); //$NON-NLS-1$
- buffer.append(byteOutput.toString());
- setText(buffer.toString());
- }
-
- /**
- * Get the text.
- *
- * @return text or or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getText() {
- return text;
- }
-
- /**
- * Set the text
- *
- * @param string
- *
- * @since 1.0.0
- */
- public void setText(String string) {
- text = string;
- }
-
- /**
- * Set every entry to the default value except the properties file name.
- *
- *
- * @since 1.0.0
- */
- public void reset() {
- setExecutionMap(0);
- setTargetException(null);
- localeOfOrigin = null;
- sourceIdentifier = null;
- elapsedTime = null;
- setText(null);
- }
-
- /**
- * Set locale of origin.
- *
- * @param origin
- *
- * @since 1.0.0
- */
- public void setLocaleOfOrigin(String origin) {
- localeOfOrigin = origin;
- }
-
- /**
- * Set source id.
- *
- * @param id
- *
- * @since 1.0.0
- */
- public void setSourceID(String id) {
- sourceIdentifier = id;
- }
-
- /**
- * Set elapsed time.
- *
- * @param time
- *
- * @since 1.0.0
- */
- public void setElapsedTime(long time) {
- elapsedTime = String.valueOf(time);
- }
-
- /**
- * Set source identifier.
- *
- * @param string
- *
- * @since 1.0.0
- */
- public void setSourceIdentifier(String string) {
- setSourceID(string);
- }
-
- /**
- * Set message type identifier.
- *
- * @param string
- *
- * @since 1.0.0
- * @deprecated Use {@link #setText(String)} instead and calling it with the result of {@link java.text.MessageFormat#format(java.lang.String, java.lang.Object[])}
- */
- public void setMessageTypeIdentifier(String string) {
- messageTypeIdentifier = string;
- }
-
- /**
- * Set message type id. Same as <code>setMessageTypeIdentifier.</code>
- * @param string
- *
- * @since 1.0.0
- * @deprecated Use {@link #setText(String)} instead and calling it with the result of {@link java.text.MessageFormat#format(java.lang.String, java.lang.Object[])}
- */
- public void setMessageTypeID(String string) {
- setMessageTypeIdentifier(string);
- }
-
- /**
- * Set tokens. (Currently this is ignored).
- *
- * @param strings
- *
- * @since 1.0.0
- * @deprecated Use {@link #setText(String)} instead and calling it with the result of {@link java.text.MessageFormat#format(java.lang.String, java.lang.Object[])}
- */
- public void setTokens(String[] strings) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
- PrintWriter printWriter = new PrintWriter(byteOutput);
- if (text != null)
- printWriter.println(text);
- if (_caughtException != null) {
- _caughtException.printStackTrace(printWriter);
- }
- printWriter.flush();
- return byteOutput.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java
deleted file mode 100644
index 5d1e951..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxy;
-
-/**
- * Basic log renderer interface. It is replaced by the extension <code>ILogRenderer2.</code>
- *
- * @since 1.0.0
- */
-public interface ILogRenderer {
-
- /**
- * Logged to console.
- */
- final public static String CONSOLE_DESCRIPTION = "console"; //$NON-NLS-1$
-
- /**
- * Logged to workbench.
- */
- final public static String WORKBENCH_DESCRIPTION = "workbench log"; //$NON-NLS-1$
-
- /**
- * Not logged.
- */
- final public static String NOLOG_DESCRIPTION = ""; //$NON-NLS-1$
-
- /**
- * Log levels. These are deprecated, use <code>java.util.logging.Level</code> codes instead.
- */
- final public static int LOG_ERROR = 0;
-
- final public static int LOG_TRACE = 1;
-
- final public static int LOG_WARNING = 2;
-
- final public static int LOG_INFO = 3;
-
- final public static String DefaultPluginID = "org.eclipse.jem.util"; //$NON-NLS-1$
-
- /**
- * Log the string at the specified type.
- *
- * @param msg
- * @param type
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(String msg, int type);
-
- /**
- * Start or stop the tracing.
- *
- * @param Flag
- * <code>true</code> to start the tracing.
- *
- * @since 1.0.0
- */
- public void setTraceMode(boolean Flag);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
deleted file mode 100644
index f5a670f..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.util.logging.Level;
-
-/**
- * Log renderer that provides more function. Basically it can handle
- * the logging of specific types in a different manner than the default
- * conversion to string supplied by Logger.
- *
- * It also uses the Level classes from java.util.logging as the logging levels.
- *
- * @since 1.0.0
- */
-public interface ILogRenderer2 extends ILogRenderer {
-
- /**
- * When Logger.setLevel(DEFAULT): restore to what the default level was.
- * When log(...,DEFAULT): Log at the default level for the type of object.
- */
- static final Level DEFAULT = new Logger.LocalLevel("DEFAULT", Integer.MAX_VALUE-1); //$NON-NLS-1$
-
- /**
- * When log(...,TRACE) : Log only when in trace mode.
- * Don't use in Logger.setLevel(). Has no meaning in that case.
- */
- static final Level TRACE = new Logger.LocalLevel("TRACE", Integer.MAX_VALUE-2); //$NON-NLS-1$
-
- /**
- * Log the throwable at the given level (if DEFAULT, use default level for a throwable).
- *
- * @param t
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(Throwable t, Level level);
-
- /**
- * Log the object at the given level (if DEFAULT, use default level for an object).
- *
- * @param o
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(Object o, Level level);
-
- /**
- * Log the boolean at the given level (if DEFAULT, use default level for a boolean).
- *
- * @param b
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(boolean b, Level level);
-
- /**
- * Log the char at the given level (if DEFAULT, use default level for a char).
- *
- * @param c
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(char c, Level level);
-
- /**
- * Log the byte at the given level (if DEFAULT, use default level for a byte).
- *
- * @param b
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(byte b, Level level);
-
- /**
- * Log the short at the given level (if DEFAULT, use default level for a short).
- *
- * @param s
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(short s, Level level);
-
- /**
- * Log the int at the given level (if DEFAULT, use default level for an int).
- *
- * @param i
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(int i, Level level);
-
- /**
- * Log the long at the given level (if DEFAULT, use default level for a long).
- *
- * @param l
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(long l, Level level);
-
- /**
- * Log the float at the given level (if DEFAULT, use default level for a float).
- *
- * @param f
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(float f, Level level);
-
- /**
- * Log the double at the given level (if DEFAULT, use default level for a double).
- *
- * @param d
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(double d, Level level);
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java
deleted file mode 100644
index c7c9d75..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.util.logging.Level;
-
-/**
- * Default log renderer to use when not running under Eclipse. It logs to sysout and syserr.
- *
- * @since 1.1.0
- */
-
-public class JDKConsoleRenderer implements ILogRenderer2 {
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
-
- private boolean fSettingTrace = false;
-
- private Logger fMyLogger = null;
-
- /**
- * Constructer taking a logger.
- *
- * @param logger
- *
- * @since 1.1.0
- */
- public JDKConsoleRenderer(Logger logger) {
- super();
- fMyLogger = logger;
- fTraceMode = fMyLogger.getTraceMode();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#log(java.lang.String, int)
- */
- public String log(String msg, int type) {
-
- if (type == ILogRenderer.LOG_TRACE && !fTraceMode)
- return null;
-
- if (type == ILogRenderer.LOG_ERROR)
- System.err.println(msg);
- else
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#setTraceMode(boolean)
- */
- public void setTraceMode(boolean flag) {
-
- if (fSettingTrace)
- return;
- fSettingTrace = true;
- fTraceMode = flag;
- fMyLogger.setTraceMode(flag);
- fSettingTrace = false;
- }
-
- /**
- * Log the string at the given level.
- *
- * @param msg
- * @param level
- * @return <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.1.0
- */
- protected String log(String msg, Level level) {
- if (level == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
- }
-
- /**
- * Answer if logging at the given level
- *
- * @param logLevel
- * @return <code>true</code> if logging at the given level.
- *
- * @since 1.1.0
- */
- protected boolean isLogging(Level logLevel) {
- return fTraceMode || fMyLogger.isLoggingLevel(logLevel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(boolean, java.util.logging.Level)
- */
- public String log(boolean b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(byte b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(char, java.util.logging.Level)
- */
- public String log(char c, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(c), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(double, java.util.logging.Level)
- */
- public String log(double d, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(d), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(float, java.util.logging.Level)
- */
- public String log(float f, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(f), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(int, java.util.logging.Level)
- */
- public String log(int i, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(i), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(long, java.util.logging.Level)
- */
- public String log(long l, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(l), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Object, java.util.logging.Level)
- */
- public String log(Object o, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(o), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(short, java.util.logging.Level)
- */
- public String log(short s, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(s), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Throwable, java.util.logging.Level)
- */
- public String log(Throwable t, Level level) {
- if (level == DEFAULT)
- level = Level.SEVERE;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
deleted file mode 100644
index b86ad05..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
+++ /dev/null
@@ -1,843 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.*;
-import java.util.logging.Level;
-
-/**
- * This is a base, UI independent logger. It will
- * construct a consistent msg. body, and call an enfironment specific ILogRenderer.
- * By default, this logger will use a console based ILogRenderer,
- * and a J2EE Plugin identification.
- *
- * <p>
- * When running outside of Eclipse, the trace and logging level come from the system properties
- * <ul>
- * <li>"debug" (="true") - The default is <code>false</code>.
- * <li>"logLevel" (="level" where "level" is a level string, e.g. SEVERE, WARNING, etc. from the <code>java.util.logging.Level</code> class).
- * The default is "WARNING".
- * </ul>
- *
- *
- * @since 1.0.0
- */
-public class Logger {
-
- // This is used by ILogRenderer2 to define the default level.
- static class LocalLevel extends Level {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -6273357074767854883L;
-
- public LocalLevel(String name, int level) {
- super(name, level);
- }
- }
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
- private String fPluginID;
- private ILogRenderer fRenderer = null;
- private ILogRenderer2 renderer2 = null;
- public String fLineSeperator;
- private Level level;
- private Level defaultLevel = Level.SEVERE; // By default only severe or greater are logged.
- private String logFileName;
- private final static String DefaultLoggerPlugin = ILogRenderer.DefaultPluginID;
- static private Hashtable Loggers = new Hashtable(); // Keep track of all the Loggers
- final protected static String[] LogMark = { "*** ERROR *** ", //$NON-NLS-1$
- "[Trace] ", //$NON-NLS-1$
- "+++ Warning +++ ", //$NON-NLS-1$
- "Info " }; //$NON-NLS-1$
-
- final protected static String Filler = " "; // Use this to indent msg. body //$NON-NLS-1$
-
- protected Logger() {
- this(ILogRenderer.DefaultPluginID);
- }
-
- protected Logger(String pluginID) {
- fPluginID = pluginID;
- setRenderer(new JDKConsoleRenderer(this)); // Set up default to this. Someone can change it later.
- }
-
- /**
- * Return the stacktrace as a print formatted string.
- * @param e
- * @return the stacktrace as a string.
- *
- * @since 1.0.0
- */
- public String exceptionToString(Throwable e) {
- StringWriter stringWriter = new StringWriter();
- e.printStackTrace(new PrintWriter(stringWriter));
- return stringWriter.toString();
- }
-
- /**
- * Get the system default logger. This is used for clients that don't know if they
- * are running in Eclipse or outside of it. This way they have a common logger format
- * which switch correctly.
- * @return default logger.
- *
- * @since 1.0.0
- */
- static public Logger getLogger() {
- Logger defaultLogger = (Logger) Loggers.get(DefaultLoggerPlugin);
- if (defaultLogger == null) {
- defaultLogger = new Logger();
- defaultLogger.init();
- Loggers.put(DefaultLoggerPlugin, defaultLogger);
- }
- return defaultLogger;
- }
-
- /**
- * Get the logger for a specific plugin.
- * @param pluginId
- * @return logger for a specific pluggin.
- *
- * @since 1.0.0
- */
- static public Logger getLogger(String pluginId) {
- if (pluginId == null)
- return Logger.getLogger();
- Logger Logger = (Logger) Loggers.get(pluginId);
- if (Logger == null) {
- Logger = new Logger(pluginId);
- Logger.init();
- Loggers.put(pluginId, Logger);
- }
- return Logger;
- }
-
- /**
- * Used by subclass to get a logger if it exists, but not create one.
- * @param pluginId
- * @return logger.
- *
- * @since 1.0.0
- */
- static protected Logger getLoggerIfExists(String pluginId) {
- if (pluginId == null)
- return Logger.getLogger();
- else
- return (Logger) Loggers.get(pluginId);
- }
-
- /**
- * Get the plugin id for this logger.
- * @return pluginid
- *
- * @since 1.0.0
- */
- public String getPluginID() {
- return fPluginID;
- }
-
- /**
- * Get the trace mode for this logger
- * @return <code>true</code> if tracing is going on.
- *
- * @since 1.0.0
- */
- public boolean getTraceMode() {
- return fTraceMode;
- }
-
- /*
- * Indent the Msg. Body to make it easier to read the log
- */
- private void indentMsg(String msg, StringBuffer logMsg) {
- // Line seperator is different on different platform, unix = \n, windows \r\n and mac \r
- String sep = fLineSeperator;
- if (msg.indexOf("\r\n") != -1) //$NON-NLS-1$
- sep = "\r\n"; //$NON-NLS-1$
- else if (msg.indexOf("\n") != -1) //$NON-NLS-1$
- sep = "\n"; //$NON-NLS-1$
- else if (msg.indexOf("\r") != -1) //$NON-NLS-1$
- sep = "\r"; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(msg, sep);
- boolean first = true;
- while (tokenizer.hasMoreTokens()) {
- if (first) {
- first = false;
- logMsg.append(Filler + tokenizer.nextToken());
- } else
- logMsg.append(fLineSeperator + Filler + tokenizer.nextToken());
- }
- }
- /*
- * If Eclipse is started with the -XDebug or -debug turn traces on for this Logger
- * Creation date: (8/23/2001 7:37:04 PM)
- */
- private void init() {
- if (System.getProperty("debug") != null) //$NON-NLS-1$
- fTraceMode = true;
- level = defaultLevel = Level.parse(System.getProperty("logLevel", Level.WARNING.getName())); //$NON-NLS-1$
-
- try {
- fLineSeperator = System.getProperty("line.separator"); // Diff on Win/Unix/Mac //$NON-NLS-1$
- } catch (Exception e) {
- fLineSeperator = "\n"; //$NON-NLS-1$
- }
- }
- /*
- * Generic log.
- * Creation date: (8/24/2001 1:55:34 PM)
- * @return java.lang.String
- * @param msg java.lang.String
- * @param type int
- */
- private String logAny(String msg, int type) {
- StringBuffer logMsg = new StringBuffer();
- logMsg.append(fLineSeperator);
- logMsg.append(LogMark[type]);
- return punchLog(logRest(msg, logMsg), type);
- }
-
- /**
- * This is to be used by renderers that want to put a msg out
- * in a generic format. This just returns the string that
- * should be logged. It puts things like headers on it.
- *
- * @param msg
- * @param aLevel
- * @return The generic message for the string and level.
- *
- * @since 1.0.0
- */
- public String getGenericMsg(String msg, Level aLevel) {
- StringBuffer genMsg = new StringBuffer(msg.length()+16);
- genMsg.append(fLineSeperator);
- genMsg.append(getLevelHeader(aLevel));
- genMsg.append(": "); //$NON-NLS-1$
- genMsg.append(new Date());
- indentMsg(msg, genMsg);
- return genMsg.toString();
- }
-
- private static final Level[] LEVEL_SEARCH = new Level[] {
- Level.SEVERE,
- Level.WARNING,
- Level.INFO,
- ILogRenderer2.TRACE
- };
-
- private static final String[] LEVEL_MARK = new String[] {
- "*** ERROR ***", //$NON-NLS-1$
- "+++ Warning +++", //$NON-NLS-1$
- "Info", //$NON-NLS-1$
- "[Trace]" //$NON-NLS-1$
- };
-
- private String getLevelHeader(Level aLevel) {
- for (int i=0; i<LEVEL_SEARCH.length; i++)
- if (LEVEL_SEARCH[i] == aLevel)
- return LEVEL_MARK[i];
- return aLevel.getName(); // Not found, just use level string.
- }
-
- // The write's are here for history. Will implement using log(obj, Level) for all of the types.
-
-
- /**
- * deprecated use log(Level, Exception)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- *
- */
- public String write(Level aLevel, Exception ex) {
- return log(aLevel, ex);
- }
-
- /**
- * deprecated use log(Throwable)
- * @param ex
- * @return
- *
- * @since 1.0.0
- *
- */
- public String write(Throwable ex) {
- return log(ex);
- }
-
- /**
- * deprecated use log(Object, Level)
- * @param aLevel
- * @param logEntry
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, Object logEntry) {
- return log(logEntry, aLevel);
- }
-
- /**
- * deprecated use log(String, Level)
- * @param aLevel
- * @param string
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, String string) {
- return log(string, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, Throwable ex) {
- return log(ex, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String log(Level aLevel, Exception ex) {
- return log(ex, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String log(Level aLevel, Throwable ex) {
- return log(ex, aLevel);
- }
-
- /**
- * Get the logging level
- * @return logging level
- *
- * @since 1.0.0
- */
- public Level getLevel() {
- return level;
- }
-
- /**
- * Check if the requested level is being logged. (e.g. if current level is SEVERE, then FINE will not be logged).
- * @param requestlevel
- * @return <code>true</code> if the level will be logged.
- *
- * @since 1.0.0
- */
- public boolean isLoggingLevel(Level requestlevel) {
- if (requestlevel == ILogRenderer2.TRACE && !getTraceMode())
- return false; // We aren't tracing but requested trace.
-
- return !(requestlevel.intValue() < getLevel().intValue() || getLevel() == Level.OFF);
- }
-
- /**
- * Log an error string.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logError(String msg) {
- return log(msg, Level.SEVERE);
- }
-
- /**
- * Log an error throwable
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logError(Throwable e) {
- return log(e, Level.SEVERE);
- }
-
- /**
- * Log an info message.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logInfo(String msg) {
- return log(msg, Level.INFO);
- }
-
-/**
- * Log a throwable as a warning.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logInfo(Throwable e) {
- return log(e, Level.INFO);
- }
-
- /**
- * Append the string to logMsg buffer passed in. Append the date and format the
- * string with nice indentation.
- *
- * @param msg
- * @param logMsg
- * @return the string from the logMsg after logging the rest.
- *
- * @since 1.0.0
- */
- protected String logRest(String msg, StringBuffer logMsg) {
- logMsg.append(new Date());
- indentMsg(msg, logMsg);
- return logMsg.toString();
- }
-
- /**
- * Log the msg as trace only.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logTrace(String msg) {
- if (fTraceMode)
- return log(msg, ILogRenderer2.TRACE);
- else
- return ILogRenderer.NOLOG_DESCRIPTION;
- }
-
- /**
- * Log the throwable as trace only.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logTrace(Throwable e) {
- return log(e, ILogRenderer2.TRACE);
- }
-
- /**
- * Log the message as warning.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logWarning(String msg) {
- return log(msg, Level.WARNING);
- }
- /**
- * Log the throwable as a warning.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logWarning(Throwable e) {
- return log(e, Level.WARNING);
- }
-
- /**
- * Ask the Renderer to punch the msg. in the log.. one
- * caller at the time
- * Creation date: (8/24/2001 9:19:17 AM)
- * @return java.lang.String
- * @param msg java.lang.String
- * @param type int
- */
- protected synchronized String punchLog(String msg, int type) {
- return fRenderer.log(msg, type);
- }
-
- /**
- * Set the renderer to use.
- * @param renderer
- *
- * @since 1.0.0
- */
- public void setRenderer(ILogRenderer renderer) {
- fRenderer = renderer;
- renderer2 = (renderer instanceof ILogRenderer2) ? (ILogRenderer2) renderer : null;
- renderer.setTraceMode(getTraceMode());
- }
-
- /**
- * Set the trace mode.
- * @param flag <code>true</code> to turn on tracing.
- *
- * @since 1.0.0
- */
- public void setTraceMode(boolean flag) {
- fTraceMode = flag;
- if (fRenderer != null)
- fRenderer.setTraceMode(flag);
- }
-
- /**
- * Set the level cutoff for logging. Anything below this level will not log.
- * Do not set level to <code>ILogRenderer2.TRACE</code>. It doesn't make sense.
- *
- * @param level (Use <code>ILogRenderer2.DEFAULT</code> to restore to default for this logger.
- *
- * @since 1.0.0
- */
- public void setLevel(Level level) {
- this.level = level != ILogRenderer2.DEFAULT ? level : defaultLevel;
- }
-
- /**
- * Set the default level for this logger. It won't touch the current level.
- *
- * @param level
- *
- * @since 1.0.0
- */
- public void setDefaultLevel(Level level) {
- this.defaultLevel = level;
- }
-
- /**
- * Get the log file name.
- * @return Returns the logFileName.
- */
- public String getLogFileName() {
- return logFileName;
- }
-
- /**
- * Set the log file name.
- * @param logFileName The logFileName to set.
- */
- public void setLogFileName(String logFileName) {
- this.logFileName = logFileName;
- }
-
- // Now all of the log() types that use a Level.
-
- /**
- * Log the throwable at the default level for a throwable.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Throwable e) {
- return log(e, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the throwable at the given level.
- * @param e
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Throwable e, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(e, logLevel);
- } else {
- // Do it the old way.
- String stackTrace = exceptionToString(e);
- return logAny(stackTrace, getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.SEVERE));
- }
- }
-
- public String log(Object o) {
- return log(o, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the object at the given level.
- * @param o
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Object o, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(o, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(o), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- // The following are added to match up with Hyades so that primitives can be logged too.
-
- /**
- * Log a boolean at the default level.
- * @param b
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(boolean b) {
- return log(b, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log a boolean at the given level.
- * @param b
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(boolean b, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(b, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(b), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the character at the default level.
- * @param c
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(char c) {
- return log(c, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the character at the given level.
- * @param c
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(char c, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(c, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(c), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the byte at the default level.
- * @param b
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(byte b) {
- return log(b, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the byte at the given level.
- * @param b
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(byte b, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(b, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(b), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the short at the default level.
- * @param s
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(short s) {
- return log(s, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the short at the given level.
- * @param s
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(short s, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(s, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(s), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the int at the default level.
- * @param i
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(int i) {
- return log(i, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the int at the default level.
- * @param i
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(int i, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(i, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(i), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the long at the default level.
- * @param l
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(long l) {
- return log(l, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the long at the given level.
- * @param l
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(long l, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(l, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(l), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the float at the default level.
- * @param f
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(float f) {
- return log(f, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the float at the given level.
- * @param f
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(float f, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(f, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(f), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the double at the default level
- * @param d
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(double d) {
- return log(d, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the double at the given level
- *
- * @param d
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(double d, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(d, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(d), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /*
- * Turn new type into old type. The defaultLevel is the
- * level to use if the incoming level is marked as default.
- */
- private int getOldType(Level aLevel) {
- if (aLevel == Level.SEVERE)
- return ILogRenderer.LOG_ERROR;
- else if (aLevel == Level.WARNING)
- return ILogRenderer.LOG_WARNING;
- else if (aLevel == Level.INFO)
- return ILogRenderer.LOG_INFO;
- else if (aLevel == ILogRenderer2.TRACE)
- return ILogRenderer.LOG_TRACE;
- else
- return ILogRenderer.LOG_INFO;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java
deleted file mode 100644
index 698a435..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchContextFactory.java,v $$
- * $$Revision: 1.4 $$ $$Date: 2005/06/16 20:14:27 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.emf.workbench.*;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-
-public class EMFWorkbenchContextFactory {
- public static final EMFWorkbenchContextFactory INSTANCE;
-
- static {
- INSTANCE = createFactoryInstance();
- }
- private final Class CONTRIBUTOR_CLASS = IEMFContextContributor.class;
- protected Map emfContextCache = new WeakHashMap();
-
-
- private static EMFWorkbenchContextFactory createFactoryInstance() {
- EMFWorkbenchContextFactory factory = createFactoryInstanceFromExtension();
- if (factory == null)
- factory = new EMFWorkbenchContextFactory();
- return factory;
- }
-
- private static EMFWorkbenchContextFactory createFactoryInstanceFromExtension() {
- final EMFWorkbenchContextFactory[] factoryHolder = new EMFWorkbenchContextFactory[1];
- RegistryReader reader = new RegistryReader(JEMUtilPlugin.ID, "internalWorkbenchContextFactory") { //$NON-NLS-1$
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals("factoryClass")) //$NON-NLS-1$
- try {
- factoryHolder[0] = (EMFWorkbenchContextFactory)element.createExecutableExtension("name"); //$NON-NLS-1$
- return true;
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return false;
- }
- };
- reader.readRegistry();
- return factoryHolder[0];
- }
-
- /**
- * Constructor for EMFNatureFactory.
- */
- protected EMFWorkbenchContextFactory() {
- super();
-
- }
-
-
- protected void cacheEMFContext(IProject aProject, EMFWorkbenchContextBase emfContext) {
- if (aProject != null && emfContext != null)
- emfContextCache.put(aProject, emfContext);
- }
-
- protected EMFWorkbenchContextBase getCachedEMFContext(IProject aProject) {
- if (aProject != null)
- return (EMFWorkbenchContextBase) emfContextCache.get(aProject);
- return null;
- }
-
- /**
- * <code>aProject</code> is either being closed or deleted so we need to cleanup our cache.
- */
- public void removeCachedProject(IProject aProject) {
- if (aProject != null)
- emfContextCache.remove(aProject);
-
- }
- /**
- * Return a new or existing EMFNature on <code>aProject</code>. Allow the <code>contributor</code>
- * to contribute to the new or existing nature prior to returning.
- */
- public EMFWorkbenchContextBase createEMFContext(IProject aProject, IEMFContextContributor contributor) {
- if (aProject == null)
- throw new IllegalStateException("[EMFWorkbenchContextBase]" + EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextFactory_UI_0")); //$NON-NLS-1$ //$NON-NLS-2$
- if (!aProject.isAccessible())
- throw new IllegalStateException("[EMFWorkbenchContextBase]" + EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextFactory_UI_1", new Object[]{aProject.getName()})); //$NON-NLS-1$ //$NON-NLS-2$
- EMFWorkbenchContextBase context = getCachedEMFContext(aProject);
- boolean contributorFound = false;
- if (context == null) {
- context = primCreateEMFContext(aProject);
- cacheEMFContext(aProject, context);
- contributorFound = initializeEMFContextFromContributors(aProject, context, contributor);
- }
- if (contributor != null && context != null && !contributorFound)
- contributor.primaryContributeToContext(context);
- return context;
- }
-
- protected boolean initializeEMFContextFromContributors(IProject aProject, EMFWorkbenchContextBase emfContext, IEMFContextContributor contributor) {
- boolean contributorFound = false;
- if (aProject == null || emfContext == null)
- return contributorFound;
- List runtimes = EMFNature.getRegisteredRuntimes(aProject);
- for (int i = 0; i < runtimes.size(); i++) {
- IProjectNature nature = (IProjectNature) runtimes.get(i);
- if (nature != null && CONTRIBUTOR_CLASS.isInstance(nature)) {
- if (nature == contributor)
- contributorFound = true;
- ((IEMFContextContributor) nature).primaryContributeToContext(emfContext);
- }
- }
- return contributorFound;
- }
-
- protected boolean isNatureEnabled(IProject aProject, String natureId) {
- try {
- return aProject.isNatureEnabled(natureId);
- } catch (CoreException e) {
- return false;
- }
- }
-
- protected String[] getNatureIds(IProject aProject) {
- try {
- if (aProject.isAccessible())
- return aProject.getDescription().getNatureIds();
- } catch (CoreException e) {
- }
- return null;
- }
-
- protected IProjectNature getNature(IProject aProject, String natureId) {
- try {
- return aProject.getNature(natureId);
- } catch (CoreException e) {
- return null;
- }
- }
-
- protected EMFWorkbenchContextBase primCreateEMFContext(IProject aProject) {
- return new EMFWorkbenchContextBase(aProject);
- }
- /**
- * Return an existing EMFNature on <code>aProject</code>.
- */
- public EMFWorkbenchContextBase getEMFContext(IProject aProject) {
- return getCachedEMFContext(aProject);
- }
-
- public ResourceSetWorkbenchSynchronizer createSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- return new ResourceSetWorkbenchSynchronizer(aResourceSet, aProject);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
deleted file mode 100644
index 7ad24b3..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
+++ /dev/null
@@ -1,879 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectResourceSetImpl.java,v $$
- * $$Revision: 1.21.2.1.2.1 $$ $$Date: 2009/08/06 22:48:54 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import java.io.IOException;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.*;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.jem.util.emf.workbench.*;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-public class ProjectResourceSetImpl extends ResourceSetImpl implements FlexibleProjectResourceSet {
- public static interface ModuleURI {
- public static final int SUB_PROTOCOL_INDX = 0;
- public static final int PROJECT_NAME_INDX = 1;
- public static final int MODULE_NAME_INDX = 2;
- public static final int CONTENT_TYPE_INDX = 3;
- }
-
- public class SynchronizedResourcesEList<E extends Object & Resource> extends ResourcesEList<E> implements EList<E> {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- private final ILock lock = Job.getJobManager().newLock();
-
- public void move(int newPosition, E object) {
-
- try {
- lock.acquire();
- super.move(newPosition, object);
- } finally {
- lock.release();
- }
- }
-
- public E move(int newPosition, int oldPosition) {
-
- try {
- lock.acquire();
- return super.move(newPosition, oldPosition);
- } finally {
- lock.release();
- }
- }
-
- public boolean add(E o) {
-
- try {
- lock.acquire();
- return super.add(o);
- } finally {
- lock.release();
- }
- }
-
- public void add(int index, E element) {
-
- try {
- lock.acquire();
- super.add(index, element);
- } finally {
- lock.release();
- }
- }
-
- public boolean addAll(Collection<? extends E> c) {
-
- try {
- lock.acquire();
- return super.addAll(c);
- } finally {
- lock.release();
- }
- }
-
- public boolean addAll(int index, Collection<? extends E> c) {
-
- try {
- lock.acquire();
- return super.addAll(index, c);
- } finally {
- lock.release();
- }
- }
-
- public void clear() {
-
- try {
- lock.acquire();
- super.clear();
- } finally {
- lock.release();
- }
- }
-
- public boolean contains(Object o) {
-
- try {
- lock.acquire();
- return super.contains(o);
- } finally {
- lock.release();
- }
- }
-
- public boolean containsAll(Collection<?> c) {
-
- try {
- lock.acquire();
- return super.containsAll(c);
- } finally {
- lock.release();
- }
- }
-
- public boolean equals(Object o) {
-
- try {
- lock.acquire();
- return super.equals(o);
- } finally {
- lock.release();
- }
- }
-
- public E get(int index) {
-
- try {
- lock.acquire();
- return super.get(index);
- } finally {
- lock.release();
- }
- }
-
- public int hashCode() {
-
- try {
- lock.acquire();
- return super.hashCode();
- } finally {
- lock.release();
- }
- }
-
- public int indexOf(Object o) {
-
- try {
- lock.acquire();
- return super.indexOf(o);
- } finally {
- lock.release();
- }
- }
-
- public boolean isEmpty() {
-
- try {
- lock.acquire();
- return super.isEmpty();
- } finally {
- lock.release();
- }
- }
-
- public Iterator<E> iterator() {
-
- try {
- lock.acquire();
- return super.iterator();
- } finally {
- lock.release();
- }
- }
-
- public int lastIndexOf(Object o) {
-
- try {
- lock.acquire();
- return super.lastIndexOf(o);
- } finally {
- lock.release();
- }
- }
-
- public ListIterator<E> listIterator() {
-
- try {
- lock.acquire();
- return super.listIterator();
- } finally {
- lock.release();
- }
- }
-
- public ListIterator<E> listIterator(int index) {
-
- try {
- lock.acquire();
- return super.listIterator(index);
- } finally {
- lock.release();
- }
- }
-
- public boolean remove(Object o) {
-
- try {
- lock.acquire();
- return super.remove(o);
- } finally {
- lock.release();
- }
- }
-
- public E remove(int index) {
-
- try {
- lock.acquire();
- return super.remove(index);
- } finally {
- lock.release();
- }
- }
-
- public boolean removeAll(Collection<?> c) {
-
- try {
- lock.acquire();
- return super.removeAll(c);
- } finally {
- lock.release();
- }
- }
-
- public boolean retainAll(Collection<?> c) {
-
- try {
- lock.acquire();
- return super.retainAll(c);
- } finally {
- lock.release();
- }
- }
-
- public E set(int index, E element) {
-
- try {
- lock.acquire();
- return super.set(index, element);
- } finally {
- lock.release();
- }
- }
-
- public int size() {
-
- try {
- lock.acquire();
- return super.size();
- } finally {
- lock.release();
- }
- }
-
- public List<E> subList(int fromIndex, int toIndex) {
-
- try {
- lock.acquire();
- return super.subList(fromIndex, toIndex);
- } finally {
- lock.release();
- }
- }
-
- public Object[] toArray() {
-
- try {
- lock.acquire();
- return super.toArray();
- } finally {
- lock.release();
- }
- }
-
- public <T> T[] toArray(T[] a) {
-
- try {
- lock.acquire();
- return super.toArray(a);
- } finally {
- lock.release();
- }
- }
-
- // release lock during notifications
- protected void dispatchNotification(Notification notification) {
-
- int lockDepth;
- lockDepth = lock.getDepth();
- try {
- for(int i=0; i<lockDepth; i++)
- lock.release();
- super.dispatchNotification(notification);
- } finally {
- for(int i=0; i<lockDepth; i++)
- lock.acquire(); // Re-acquire lock after notify
- }
- }
-
- }
-
- private boolean isReleasing = false;
- private IProject project;
- protected List resourceHandlers = new ArrayList();
- protected ResourceSetWorkbenchSynchronizer synchronizer;
- protected ProjectResourceSetImpl() {
- setURIResourceMap(new HashMap(10)); // Tell it to cache uri->resource access.
- getLoadOptions().put(XMLResource.OPTION_USE_PARSER_POOL, EMFNature.SHARED_PARSER_POOL);
- }
- public ProjectResourceSetImpl(IProject aProject) {
- this();
- setProject(aProject);
- initializeSharedCacheListener();
- }
- protected void initializeSharedCacheListener() {
- JEMUtilPlugin.getSharedCache().beginListening(this);
- }
- protected boolean isReleasing() {
- return isReleasing;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#delegatedGetResource(URI, boolean)
- */
- protected Resource delegatedGetResource(URI uri, boolean loadOnDemand) {
- Resource res = super.delegatedGetResource(uri, loadOnDemand);
- if (res == null)
- res = getResourceFromHandlers(uri);
- return res;
- }
-
- public Resource createResource(URI uri, String contentType) {
- if (isReleasing) return null;
- //Check the map first when creating the resource and do not
- //normalize if a value is found.
- boolean isMapped = detectURIMapping(uri);
- boolean hasContentType = (getContentTypeName(uri) != null);
- URI converted = uri;
- if (!isMapped)
- converted = getURIConverter().normalize(uri);
- else if (hasContentType)
- converted = getURIConverter().normalize(uri);
-
- Resource result = createResourceFromHandlers(converted);
- if (result == null) {
- Resource.Factory resourceFactory = getResourceFactoryRegistry().getFactory(uri);
- if (resourceFactory != null)
- {//We got the right factory, now use the right URI
- result = resourceFactory.createResource(converted);
- getResources().add(result);
- }
- }
-
-
- return result;
- }
-
- public Resource createResource(URI uri) {
- return createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
- }
-
- private boolean detectURIMapping(URI uri) {
- if (uri == null) return false;
- return !(((URIConverterImpl.URIMap)getURIConverter().getURIMap()).getURI(uri).equals(uri));
- }
- /**
- * Return the IFile for the <code>uri</code> within the Workspace. This URI is assumed to be
- * absolute in the following format: platform:/resource/....
- */
- private IFile getPlatformFile(URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri)) {
- String fileString = URI.decode(uri.path());
- fileString = fileString.substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileString));
- }
- return null;
- }
- public Resource createResource(URI uri, Resource.Factory resourceFactory) {
- if (isReleasing) return null;
- //Check the map first when creating the resource and do not
- //normalize if a value is found.
- boolean isMapped = detectURIMapping(uri);
- boolean hasContentType = (getContentTypeName(uri) != null);
- URI converted = uri;
- if (!isMapped)
- converted = getURIConverter().normalize(uri);
- else if (hasContentType)
- converted = getURIConverter().normalize(uri);
- Resource result = createResourceFromHandlers(converted);
- if (result == null) {
-
- if (resourceFactory != null)
- {
- result = resourceFactory.createResource(converted);
- getResources().add(result);
- getURIResourceMap().put(uri, result);
- return result;
- }
- else
- {
- return null;
- }
-
- }
- return result;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandLoad(Resource)
- */
- protected void demandLoad(Resource resource) throws IOException {
- if (!isReleasing)
- super.demandLoad(resource);
- }
-
- /**
- * See if any resource handlers from the WorkbenchContext
- * decide to create the Resource in another manner.
- */
- protected Resource createResourceFromHandlers(URI uri) {
- Resource resource = null;
- ResourceHandler handler = null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- handler = (ResourceHandler) resourceHandlers.get(i);
- resource = handler.createResource(this, uri);
- if (resource != null)
- return resource;
- }
- return null;
- }
- /**
- * See if any resource handlers from the WorkbenchContext
- * can return a Resource from a <code>uri</code>.
- */
- protected Resource getResourceFromHandlers(URI uri) {
- if (isReleasing) return null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- Resource resource = ((ResourceHandler) resourceHandlers.get(i)).getResource(this, uri);
- if (resource != null)
- return resource;
- }
- return null;
- }
-
- public void release() {
- // Send out notification of release.
- if (eNotificationRequired()) {
- eNotify(new NotificationImpl(SPECIAL_NOTIFICATION_TYPE, null, null, Notification.NO_INDEX, false) {
- /* (non-Javadoc)
- * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getFeatureID(java.lang.Class)
- */
- public int getFeatureID(Class expectedClass) {
- return PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getNotifier()
- */
- public Object getNotifier() {
- return ProjectResourceSetImpl.this;
- }
- });
- }
- setIsReleasing(true);
- if (synchronizer != null)
- synchronizer.dispose();
- synchronizer = null;
- removeAndUnloadAllResources();
- resourceHandlers = null;
- eAdapters().clear();
- setProject(null);
- JEMUtilPlugin.getSharedCache().stopListening(this);
- }
- protected void removeAndUnloadAllResources() {
- boolean caughtException = false;
- if (getResources().isEmpty()) return;
- List list = new ArrayList(getResources());
- getResources().clear();
- Resource res;
- int size = list.size();
- for (int i = 0; i < size; i++) {
- res = (Resource) list.get(i);
- try {
- res.unload();
- } catch (RuntimeException ex) {
- Logger.getLogger().logError(ex);
- caughtException = true;
- }
- }
- if (caughtException)
- throw new RuntimeException("Exception(s) unloading resources - check log files"); //$NON-NLS-1$
- }
- protected void setIsReleasing(boolean aBoolean) {
- isReleasing = aBoolean;
- }
- /**
- * Gets the project.
- * @return Returns a IProject
- */
- public IProject getProject() {
- return project;
- }
- /**
- * Sets the project.
- * @param project The project to set
- */
- protected void setProject(IProject project) {
- this.project = project;
- }
- /*
- * Javadoc copied from interface.
- */
- public EObject getEObject(URI uri, boolean loadOnDemand) {
- if (isReleasing) return null;
- Resource resource = getResource(uri.trimFragment(), loadOnDemand);
- EObject result = null;
- if (resource != null && resource.isLoaded())
- result = resource.getEObject(uri.fragment());
- if (result == null)
- result = getEObjectFromHandlers(uri, loadOnDemand);
- return result;
- }
- /**
- * See if any resource handlers from the WorkbenchContext
- * can return a EObject from a <code>uri</code> after
- * failing to find it using the normal mechanisms.
- */
- protected EObject getEObjectFromHandlers(URI uri, boolean loadOnDemand) {
- EObject obj = null;
- ResourceHandler handler = null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- handler = (ResourceHandler) resourceHandlers.get(i);
- obj = handler.getEObjectFailed(this, uri, loadOnDemand);
- if (obj != null)
- return obj;
- }
- return null;
- }
-
- public boolean add(ResourceHandler resourceHandler) {
- return resourceHandlers.add(resourceHandler);
- }
- public void addFirst(ResourceHandler resourceHandler) {
- resourceHandlers.add(0, resourceHandler);
- }
- public boolean remove(ResourceHandler resourceHandler) {
- return resourceHandlers.remove(resourceHandler);
- }
- /**
- * Returns the synchronizer.
- * @return ResourceSetWorkbenchSynchronizer
- */
- public ResourceSetWorkbenchSynchronizer getSynchronizer() {
- return synchronizer;
- }
- /**
- * Sets the synchronizer.
- * @param synchronizer The synchronizer to set
- */
- public void setSynchronizer(ResourceSetWorkbenchSynchronizer synchronizer) {
- this.synchronizer = synchronizer;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.ResourceSet#setResourceFactoryRegistry(Resource.Factory.Registry)
- */
- public void setResourceFactoryRegistry(Resource.Factory.Registry factoryReg) {
- if (resourceFactoryRegistry != null && factoryReg != null) {
- preserveEntries(factoryReg.getExtensionToFactoryMap(), resourceFactoryRegistry.getExtensionToFactoryMap());
- preserveEntries(factoryReg.getProtocolToFactoryMap(), resourceFactoryRegistry.getProtocolToFactoryMap());
- }
- super.setResourceFactoryRegistry(factoryReg);
- }
- /*
- * Preserve the entries from map2 in map1 if no collision.
- */
- protected void preserveEntries(Map map1, Map map2) {
- if (map2.isEmpty())
- return;
- Iterator it = map2.entrySet().iterator();
- Map.Entry entry;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- if (!map1.containsKey(entry.getKey()))
- map1.put(entry.getKey(), entry.getValue());
- }
- }
- /*
- * Javadoc copied from interface.
- */
- public Resource getResource(URI uri, boolean loadOnDemand) {
- if (isReleasing) return null;
-
- Map<URI, Resource> map = getURIResourceMap();
- if (map != null)
- {
- Resource resource = map.get(uri);
- if (resource != null)
- {
- if (loadOnDemand && !resource.isLoaded())
- {
- demandLoadHelper(resource);
- }
- return resource;
- }
- }
-
- URIConverter theURIConverter = getURIConverter();
- URI normalizedURI = theURIConverter.normalize(uri);
- List resourcesToRemove = new ArrayList();
- for (Resource resource : getResources())
- {
- if (theURIConverter.normalize(resource.getURI()).equals(normalizedURI)) {
-
- if (getContentTypeName(uri) == null) { // loading from legacy archive api or non-typed resource
- if (loadOnDemand && !resource.isLoaded())
- {
- demandLoadHelper(resource);
- }
-
- if (map != null)
- {
- map.put(uri, resource);
- }
- return resource;
- } else {// content type is known
- boolean resourceExists = false;
- IFile file = getPlatformFile(resource);
- if (file != null)
- resourceExists = file.exists();
- String resourceContentTypeID = getContentTypeID(resource);
- String uriContentTypeID = getContentTypeName(uri);
- String existingMapKeyType = (findKey(resource) != null) ? getContentTypeName(findKey(resource)) : null;
- if((!map.containsValue(resource) || ((map.get(uri) != null) && map.get(uri).equals(resource))) // existing resource with alternate mapping doesn't exist in map
- || ((resourceContentTypeID != null && resourceContentTypeID.equals(uriContentTypeID)))) {
- if (loadOnDemand && !resource.isLoaded()) {
- demandLoadHelper(resource);
- } // if embedded uri content type is different than resource content type, continue searching
- if (resourceContentTypeID != null
- && uriContentTypeID != null) {
- if ((resourceContentTypeID.equals(uriContentTypeID)) && existingMapKeyType == null) continue;
- if ((!resourceContentTypeID.equals(uriContentTypeID)) || (existingMapKeyType != null && !existingMapKeyType
- .equals(uriContentTypeID)))
- continue;
- else if (existingMapKeyType == null && !resourceExists) {
- resourcesToRemove.add(resource);
- continue;
- }
- } else if (uriContentTypeID != null && resourceContentTypeID == null && !resourceExists) {
- resourcesToRemove.add(resource);
- continue;
- }
-
- if (map != null && (map.get(uri) == null)) {
- map.put(uri, resource);
- }
- return resource;
- }
- }
- }
- }
- // Cleanup invalid resources
- getResources().removeAll(resourcesToRemove);
- Resource delegatedResource = delegatedGetResource(uri, loadOnDemand);
- if (delegatedResource != null)
- {
- if (map != null)
- {
- map.put(uri, delegatedResource);
- }
- return delegatedResource;
- }
-
- if (loadOnDemand)
- {
- Resource resource = demandCreateResource(uri);
- if (resource == null)
- {
- throw new RuntimeException("Cannot create a resource for '" + uri + "'; a registered resource factory is needed");
- }
-
- if (map != null)
- {
- map.put(uri, resource);
- }
-
- demandLoadHelper(resource);
-
-
- return resource;
- }
-
- return null;
-
- }
- private IFile getPlatformFile(Resource res) {
- IFile file = null;
- file = getPlatformFile(res.getURI());
- if (file == null) {
- if (res.getResourceSet() != null) {
- URIConverter converter = res.getResourceSet().getURIConverter();
- URI convertedUri = converter.normalize(res.getURI());
- if (!res.getURI().equals(convertedUri))
- file = getPlatformFile(convertedUri);
- }
- }
- return file;
- }
-
- private String getContentTypeID(Resource resource) {
- IFile file = getPlatformFile(resource);
- IContentDescription desc = null;
- try {
- desc = file.getContentDescription();
- } catch (CoreException e) {
- }
- if (desc != null && desc.getContentType() != null)
- return desc.getContentType().getId();
- return null;
- }
- private URI findKey(Resource resource) {
- Map aMap = getURIResourceMap();
- Set keys = aMap.keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
- URI name = (URI) iterator.next();
- if (aMap.get(name).equals(resource))
- return name;
- }
- return null;
- }
- protected static String getContentTypeName(URI uri) {
-
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri) || !isValidFullyQualifiedModuleURI(uri))
- return null;
- String contentTypeIdentifier = (uri.segmentCount() > 3 ? uri.segment(ModuleURI.CONTENT_TYPE_INDX) : null);
- if (contentTypeIdentifier != null && Platform.getContentTypeManager().getContentType(uri.segment(ModuleURI.CONTENT_TYPE_INDX)) != null)
- return contentTypeIdentifier;
- else
- return null;
- }
- public static boolean isValidFullyQualifiedModuleURI(URI aModuleURI) {
- if (aModuleURI.segmentCount() < 3) {
- return false;
- }
- return true;
- }
- /*
- * Javadoc copied from interface.
- */
- public Resource getResource(URI uri, boolean loadOnDemand, Resource.Factory resourceFactory) {
- if (isReleasing) return null;
-
-
- Map<URI, Resource> map = getURIResourceMap();
- if (map != null)
- {
- Resource resource = map.get(uri);
- if (resource != null)
- {
- if (loadOnDemand && !resource.isLoaded())
- {
- demandLoadHelper(resource);
- }
- return resource;
- }
- }
-
- URIConverter theURIConverter = getURIConverter();
- URI normalizedURI = theURIConverter.normalize(uri);
- for (Resource resource : getResources())
- {
- if (theURIConverter.normalize(resource.getURI()).equals(normalizedURI))
- {
- if (loadOnDemand && !resource.isLoaded())
- {
- demandLoadHelper(resource);
- }
-
- if (map != null)
- {
- map.put(uri, resource);
- }
- return resource;
- }
- }
-
- Resource delegatedResource = delegatedGetResource(uri, loadOnDemand);
- if (delegatedResource != null)
- {
- if (map != null)
- {
- map.put(uri, delegatedResource);
- }
- return delegatedResource;
- }
-
- if (loadOnDemand)
- {
- Resource resource = demandCreateResource(uri,resourceFactory);
- if (resource == null)
- {
- throw new RuntimeException("Cannot create a resource for '" + uri + "'; a registered resource factory is needed");
- }
-
- demandLoadHelper(resource);
-
- if (map != null)
- {
- map.put(uri, resource);
- }
- return resource;
- }
-
- return null;
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.emf.workbench.ProjectResourceSet#resetNormalizedURICache()
- */
- public void resetNormalizedURICache() {
- if (getURIResourceMap() != null)
- getURIResourceMap().clear();
- }
-
- protected Resource demandCreateResource(URI uri, Factory resourceFactory) {
- // TODO Auto-generated method stub
- return createResource(uri,resourceFactory);
- }
-
- public EList<Resource> getResources() {
- if (resources == null)
- {
- resources = new SynchronizedResourcesEList<Resource>();
- }
- return resources;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java
deleted file mode 100644
index 9234123..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkspaceResourceHandler.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * The main purpose of this class is to redirect, if necessary, to another
- * ResourceSet. This class should be used in conjunction with the WorkbenchURIConverter
- * so that the URIs passed will use the platform protocol. Anything else will be considered
- * to be ambiguous and we will not be able to redirect.
- */
-public class WorkspaceResourceHandler implements ResourceHandler {
- /**
- * Constructor for WorkspaceResourceHandler.
- */
- public WorkspaceResourceHandler() {
- super();
- }
- /*
- * @see IResourceHandler#getResource(ResourceSet, URI)
- */
- public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri))
- return getResourceForPlatformProtocol(originatingResourceSet, uri);
- URI mappedURI = ((URIConverterImpl.URIMap)originatingResourceSet.getURIConverter().getURIMap()).getURI(uri);
- if (isGlobalPluginLoad(mappedURI))
- return getResourceForPlatformPluginProtocol(originatingResourceSet, uri);
- return null;
- }
- /**
- * Redirect to the correct project based on the project name in the <code>uri</code>.
- * The <code>uri</code> will be in the following format: platform:/resource/[project name].
- */
- protected Resource createResourceForPlatformProtocol(ResourceSet originatingResourceSet, URI uri) {
- String projectName = uri.segment(1);
- IProject project = getProject(projectName);
- if (project != null && project.isAccessible()) {
- ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(project);
- if (originatingResourceSet != set)
- return createResource(uri, set);
- }
- return null;
- }
- /**
- * Redirect to the correct project based on the project name in the <code>uri</code>.
- * The <code>uri</code> will be in the following format: platform:/resource/[project name].
- */
- protected Resource createResourceForPlatformPluginProtocol(ResourceSet originatingResourceSet, URI uri) {
-
- ResourceSet set = JEMUtilPlugin.getPluginResourceSet();
- return createResource(uri, set);
- }
- protected Resource createResource(URI uri, ResourceSet redirectedResourceSet) {
- return redirectedResourceSet.createResource(uri);
- }
- /**
- * Redirect to the correct project based on the first segment in the file name.
- * This is for compatability purposes for people using the platform:/resource protocol.
- */
- protected Resource getResourceForPlatformProtocol(ResourceSet originatingResourceSet, URI uri) {
- String projectName = uri.segment(1);
- IProject project = getProject(projectName);
- if (project != null && project.isAccessible()) {
- ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(project);
- if (originatingResourceSet != set)
- return getResource(uri, set);
- }
- return null;
- }
- /**
- * Redirect to the correct project based on the first segment in the file name.
- * This is for compatability purposes for people using the platform:/resource protocol.
- */
- protected Resource getResourceForPlatformPluginProtocol(ResourceSet originatingResourceSet, URI uri) {
-
- ResourceSet set = JEMUtilPlugin.getPluginResourceSet();
- return getResource(uri, set);
-
- }
- protected Resource getResource(URI uri, ResourceSet redirectedResourceSet) {
- return redirectedResourceSet.getResource(uri, false);
- }
-
- protected IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
- protected IProject getProject(String projectName) {
- IWorkspace ws = getWorkspace();
- if (ws == null)
- return null;
- return ws.getRoot().getProject(projectName);
- }
- protected IProject getProject(ResourceSet resourceSet) {
- return WorkbenchResourceHelperBase.getProject(resourceSet);
- }
- /**
- * @see org.eclipse.jem.util.ResourceHandler#createResource(ResourceSet, URI)
- */
- public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri))
- return createResourceForPlatformProtocol(originatingResourceSet, uri);
- URI mappedURI = ((URIConverterImpl.URIMap)originatingResourceSet.getURIConverter().getURIMap()).getURI(uri);
- if (isGlobalPluginLoad(mappedURI))
- return createResourceForPlatformPluginProtocol(originatingResourceSet, uri);
- return null;
- }
- /**
- * @see org.eclipse.jem.util.ResourceHandler#getEObjectFailed(ResourceSet, URI, boolean)
- * Subclasses may override.
- */
- public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
- return null;
- }
-
- protected boolean isGlobalPluginLoad(URI aURI) {
- if (WorkbenchResourceHelperBase.isPlatformPluginResourceURI(aURI)) {
- String[] globalPlugins = JEMUtilPlugin.getGlobalLoadingPluginNames();
- for (int i=0;i<globalPlugins.length;i++) {
- if (aURI.segment(1).startsWith(globalPlugins[i]))
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java
deleted file mode 100644
index 6c10afe..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkspaceResourceNotifier.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.notify.impl.NotifierImpl;
-
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-
-/**
- * This class is used to capture all ADD and REMOVE notifications from each ProjectResourceSet
- * and forward it on to any interrested listeners. This is to allow you to listen to one object
- * to gain all ADD and REMOVE notifications for each ResourceSet within the system.
- */
-public class WorkspaceResourceNotifier extends NotifierImpl {
- protected Adapter projectAdapter = new WorkspaceResourceCacheAdapter();
-
- class WorkspaceResourceCacheAdapter extends AdapterImpl {
- /**
- * Forward ADD and REMOVE notification.
- */
- public void notifyChanged(Notification msg) {
- switch (msg.getEventType()) {
- case Notification.ADD :
- case Notification.ADD_MANY :
- case Notification.REMOVE :
- case Notification.REMOVE_MANY :
- eNotify(msg);
- break;
- }
- }
- }
-
- /**
- * Constructor for WorkspaceResourceCache.
- */
- public WorkspaceResourceNotifier() {
- super();
- }
-
- /**
- * Begin listening to a ProjectResourceSet.
- */
- public void beginListening(ProjectResourceSet aResourceSet) {
- if (aResourceSet != null) {
- if (aResourceSet.eAdapters() == null ||
- !aResourceSet.eAdapters().contains(projectAdapter))
- aResourceSet.eAdapters().add(projectAdapter);
- }
- }
- /**
- * Stop listening to a ProjectResourceSet.
- */
- public void stopListening(ProjectResourceSet aResourceSet) {
- if (aResourceSet != null)
- aResourceSet.eAdapters().remove(projectAdapter);
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java
deleted file mode 100644
index f85f7b0..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFNatureRegistry.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench.nature;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-public class EMFNatureRegistry {
-
- private static final String NATURE_REGISTRATION_POINT = "org.eclipse.jem.util.nature_registration"; //$NON-NLS-1$
- private static final String NATURE = "nature"; //$NON-NLS-1$
- private static final String STATIC_ID = "id"; //$NON-NLS-1$
-
- /**
- * Constructor
- */
- private EMFNatureRegistry() {
- super();
- readRegistry();
- }
-
- private static EMFNatureRegistry singleton;
-
- public final Set REGISTERED_NATURE_IDS = new HashSet();
-
- public static EMFNatureRegistry singleton() {
- if (singleton == null)
- singleton = new EMFNatureRegistry();
- return singleton;
- }
-
- protected void readRegistry() {
- // register Nature IDs for the J2EENatures
- IExtensionRegistry r = Platform.getExtensionRegistry();
- IConfigurationElement[] ce = r.getConfigurationElementsFor(NATURE_REGISTRATION_POINT);
- String natureId;
- for (int i=0; i<ce.length; i++) {
- if (ce[i].getName().equals(NATURE)) {
- natureId = ce[i].getAttribute(STATIC_ID);
- if (natureId != null)
- registerNatureID(natureId);
- }
- }
- }
-
- /**
- * @param natureId
- */
- private void registerNatureID(String natureId) {
- if (!REGISTERED_NATURE_IDS.contains(natureId))
- REGISTERED_NATURE_IDS.add(natureId);
- else
- Logger.getLogger().logError(EMFWorkbenchResourceHandler.getString("EMFNatureRegistry_ERROR_0", new Object[] {natureId})); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java
deleted file mode 100644
index 31a8e45..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchResourceHandler.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench.nls;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class EMFWorkbenchResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("emfworkbench");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle= getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- } else {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
-public static String getString(String key, Object[] args) {
-
- try {return MessageFormat.format(getString(key), args);}
- catch (IllegalArgumentException e) {return getString(key);}
-
-}
-public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/CharacterUtil.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/CharacterUtil.java
deleted file mode 100644
index d452b01..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/CharacterUtil.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.ibm.icu.text.UTF16;
-
-
-/**
- * Static helper to handle characters in the new UTF multi-char format.
- * It is needed because ICU4J currently doesn't handle some correctly yet that we
- * need to have working. As ICU4J gets them working, the methods here will become
- * deprecated.
- *
- * @since 1.2.0
- */
-public class CharacterUtil {
-
- private CharacterUtil() {
-
- }
-
-
- /**
- * TODO So until ICU4J does work correctly this util will be needed. It will
- * stay around because it is API, but at that time it will be marked deprecated. It should
- * also then reroute to ICU4J instead of doing the method reflections.
- */
- private static Method METHOD_JAVA_IDENTIFIER_START, METHOD_JAVA_IDENTIFIER_PART;
-
- static {
- // Try to get the Character.isJavaIdentifier(int) method. If there, then we are in 1.5 or above. Else use the char form.
- try {
- METHOD_JAVA_IDENTIFIER_START = Character.class.getMethod("isJavaIdentifierStart", new Class[] {Integer.TYPE});
- } catch (SecurityException e) {
- // Default to use (char) type instead.
- METHOD_JAVA_IDENTIFIER_START = null;
- } catch (NoSuchMethodException e) {
- // Default to use (char) type instead.
- METHOD_JAVA_IDENTIFIER_START = null;
- }
- try {
- METHOD_JAVA_IDENTIFIER_PART = Character.class.getMethod("isJavaIdentifierPart", new Class[] {Integer.TYPE});
- } catch (SecurityException e) {
- // Default to use (char) type instead.
- METHOD_JAVA_IDENTIFIER_PART = null;
- } catch (NoSuchMethodException e) {
- // Default to use (char) type instead.
- METHOD_JAVA_IDENTIFIER_PART = null;
- }
- }
-
- /**
- * Is start of java identifier
- * @param intChar int character (UTF multi-char is valid)
- * @return <code>true</code> if start of java identifier.
- *
- * @see Character#isJavaIdentifierStart(char)
- * @since 1.2.0
- */
- public static boolean isJavaIdentifierStart(int intChar) {
- if (METHOD_JAVA_IDENTIFIER_START != null) {
- try {
- return ((Boolean) METHOD_JAVA_IDENTIFIER_START.invoke(null, new Object[] {new Integer(intChar)})).booleanValue();
- } catch (IllegalArgumentException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
- }
- return Character.isJavaIdentifierStart((char) intChar);
- }
-
- /**
- * Is start of java identifier
- * @param intChar int character (UTF multi-char is valid)
- * @return <code>true</code> if start of java identifier.
- *
- * @see Character#isJavaIdentifierStart(char)
- * @since 1.2.0
- */
- public static boolean isJavaIdentifierPart(int intChar) {
- if (METHOD_JAVA_IDENTIFIER_PART != null) {
- try {
- return ((Boolean) METHOD_JAVA_IDENTIFIER_PART.invoke(null, new Object[] {new Integer(intChar)})).booleanValue();
- } catch (IllegalArgumentException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
- }
- return Character.isJavaIdentifierPart((char) intChar);
- }
-
- public static abstract class AbstractCharIterator {
-
-
- protected final CharSequence charSeq;
- private int pos = 0;
- private int lastCharIndex = 0;
-
- /**
- * Create with a string.
- * @param charSeq
- *
- * @since 1.2.0
- */
- public AbstractCharIterator(CharSequence charSeq) {
- this.charSeq = charSeq;
- }
-
- /**
- * Set the next char index.
- * @param index
- *
- * @since 1.2.0
- */
- public void setIndex(int index) {
- pos = index;
- }
-
- /**
- * Has another char.
- * @return <code>true</code> if there is another char to return.
- *
- * @since 1.2.0
- */
- public boolean hasNext() {
- return pos < charSeq.length();
- }
-
- /**
- * Has another char before the current position. Doing previous
- * will return the char that was just returned.
- * @return
- *
- * @since 1.2.0
- */
- public boolean hasPrevious() {
- return pos > 0;
- }
-
- /**
- * Return next char from the one that was just returned.
- * @return next char.
- *
- * @since 1.2.0
- */
- public int next() {
- if (!hasNext())
- throw new IllegalStateException();
-
- int next = utfCharAt(pos);
- lastCharIndex = pos;
- pos += UTF16.getCharCount(next);
- return next;
- }
-
- /**
- * Return the UTF-32 char at the given position.
- * @param pos
- * @return
- *
- * @since 1.2.0
- */
- protected abstract int utfCharAt(int pos);
-
- /**
- * Return the previous character from the one that was just returned.
- * @return
- *
- * @since 1.2.0
- */
- public int previous() {
- if (!hasPrevious())
- throw new IllegalStateException();
-
- int next;
- if (UTF16.isTrailSurrogate(charSeq.charAt(--pos))) {
- if (pos > 0)
- next = utfCharAt(--pos);
- else
- next = charSeq.charAt(pos);
- } else {
- next = charSeq.charAt(pos);
- }
- lastCharIndex = pos;
- return next;
- }
-
- /**
- * Return the UTF16 character position of the char that was just returned from either
- * previous or next.
- * This is the (char) position not the
- * position of logical int chars returned. For example a standard string of
- * <code>"abc"</code> the position of the char 'b' is 1. But take the string
- * <code>"ab1b2c"</code> where "b1b2" is one UTF-32 char, then the position
- * of 'c' is 3. It would not be 2, which is what the logical char position
- * would be if taking UFT32 into account.
- * @return
- *
- * @since 1.2.0
- */
- public int getPosition() {
- return lastCharIndex;
- }
-
- }
-
- /**
- * Special char iterator that returns ints instead of chars for
- * walking strings that can contain UTF multi-chars. This is
- * a limited version of {@link java.text.CharacterIterator}.
- *
- * @since 1.2.0
- */
- public static class StringIterator extends AbstractCharIterator {
-
-
- /**
- * Create with a string.
- * @param str
- *
- * @since 1.2.0
- */
- public StringIterator(String str) {
- super(str);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.CharacterUtil.AbstractCharIterator#utfCharAt(int)
- */
- protected int utfCharAt(int pos) {
- return UTF16.charAt((String) charSeq, pos);
- }
-
- }
-
- /**
- * Special char iterator that returns ints instead of chars for
- * walking strings that can contain UTF multi-chars. This is
- * a limited version of {@link java.text.CharacterIterator}.
- *
- * @since 1.2.0
- */
- public static class StringBufferIterator extends AbstractCharIterator {
-
-
- /**
- * Create with a string.
- * @param strBuffer
- *
- * @since 1.2.0
- */
- public StringBufferIterator(StringBuffer strBuffer) {
- super(strBuffer);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.CharacterUtil.AbstractCharIterator#utfCharAt(int)
- */
- protected int utfCharAt(int pos) {
- return UTF16.charAt((StringBuffer) charSeq, pos);
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java
deleted file mode 100644
index 54af2bd..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.jem.util;
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: NotPresentPerformanceMonitor.java,v $$
- * $$Revision: 1.3 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-/**
- * This is the instantiation to use if the performance monitor plugin is not installed. It basically does nothing.
- *
- * <p>
- * This class is not intended to be instantiated by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public class NotPresentPerformanceMonitor extends PerformanceMonitorUtil {
-
- /*
- * Only instantiated from this package.
- */
- NotPresentPerformanceMonitor() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#setVar(java.lang.String)
- */
- public void setVar(String var) {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int, int)
- */
- protected void doSnapshot(int step, int types) {
- }
-
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int)
- */
- protected void doSnapshot(int step) {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
deleted file mode 100644
index e6f3a1b..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util;
-import java.util.EventObject;
-
-import org.eclipse.perfmsr.core.IPerformanceMonitor;
-
-/**
- * This is a simplified wrapper to the IPerformanceMonitor that hides it so that the actual plugin can be optional and not required.
- *
- * <p>
- * This class is not meant to be subclassed by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public abstract class PerformanceMonitorUtil {
- /**
- * Event for PerformanceListener notification.
- *
- * @since 1.1.0
- */
- public static class PerformanceEvent extends EventObject {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -4680071462750180339L;
-
- PerformanceEvent(Object source, int step) {
- super(source);
- snapshowWithTypes = false;
- this.step = step;
- this.types = 0; // Not set.
- }
-
- PerformanceEvent(Object source, int step, int types) {
- super(source);
- snapshowWithTypes = true;
- this.step = step;
- this.types = types;
- }
-
-
- /**
- * Snapshot with types if <code>true</code>.
- * @since 1.1.0
- */
- public final boolean snapshowWithTypes;
-
- /**
- * Step of snapshot
- * @since 1.1.0
- */
- public final int step;
-
- /**
- * types of snapshot.
- * @since 1.1.0
- */
- public final int types;
- }
-
- /**
- * Performance Listener interface
- *
- * @since 1.1.0
- */
- public interface PerformanceListener {
- /**
- * Snapshot was called.
- * @param event
- *
- * @since 1.1.0
- */
- public void snapshot(PerformanceEvent event);
- }
-
- private PerformanceListener[] listeners;
-
- public interface Types {
-
- /**
- * 1 - Write out the performance counters from the operating system. These include working set, peak working set, elapsed time, user time, and
- * kernel time.
- */
- int OperatingSystemCounters = IPerformanceMonitor.Types.OperatingSystemCounters;
-
- /**
- * 2 - Write out the global performance info. This includes things like the total committed memory for the entire system.
- *
- * This function depends on the GetPerformanceInfo() function being available in the Windows psapi.dll. This is available in XP but is usually
- * not available in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
- */
- int GlobalSystemCounters = IPerformanceMonitor.Types.GlobalSystemCounters;
-
- /**
- * 4 - Write out the size of the Java Heap.
- */
- int JavaHeapSize = IPerformanceMonitor.Types.JavaHeapSize;
-
- /**
- * 8 - Write out how much of the Java heap is being used. This calls the garbage collector so it may skew timing results.
- */
- int JavaHeapUsed = IPerformanceMonitor.Types.JavaHeapUsed;
-
- /**
- * 16 - The plugin startup and size information.
- */
- int PluginInfo = IPerformanceMonitor.Types.PluginInfo;
-
- /** 0xffff - Everything. */
- int All = IPerformanceMonitor.Types.All;
- }
-
- private static PerformanceMonitorUtil sharedMonitor;
-
- public static PerformanceMonitorUtil getMonitor() {
- if (sharedMonitor == null) {
- try {
- Class.forName("org.eclipse.perfmsr.core.PerfMsrCorePlugin"); // This just tests if the performance plugin is available. Throws //$NON-NLS-1$
- // exception otherwise.
- Class presentClass = Class.forName("org.eclipse.jem.util.PresentPerformanceMonitor"); // Get the class we use wrapper it. //$NON-NLS-1$
- sharedMonitor = (PerformanceMonitorUtil) presentClass.newInstance();
- if (!sharedMonitor.isValid())
- sharedMonitor = null;
- } catch (RuntimeException e) {
- // If any runtime exception, just use the not present one.
- } catch (ClassNotFoundException e) {
- // If class not found, then plugin not available, so just use the not present one.
- } catch (InstantiationException e) {
- // Problem instantiating, so just use the not present one.
- } catch (IllegalAccessException e) {
- // Some illegal access, so just use the not present one.
- }
- if (sharedMonitor == null) {
- // Couldn't get the performance one for some reason. Use not present one instead.
- sharedMonitor = new NotPresentPerformanceMonitor();
- }
- }
- return sharedMonitor;
- }
-
- protected boolean isValid() {
- return true;
- }
-
- /**
- * Set the variations that are in effect.
- *
- * @param var
- * a comma delimited string of variation numbers
- */
- public abstract void setVar(String var);
-
- /**
- * Take a snapshot of some default performance measurements.
- *
- * @param step
- * this identifies the step that the snapshot is for
- */
- public final void snapshot(int step) {
- doSnapshot(step);
- if (listeners != null)
- notifySnapshot(new PerformanceEvent(this, step));
- }
-
- private void notifySnapshot(PerformanceEvent event) {
- PerformanceListener[] list = listeners;
- for (int i = 0; i < list.length; i++) {
- list[i].snapshot(event);
- }
- }
-
- /**
- * Do the actual snapshot
- * @param step
- *
- * @see #snapshot(int)
- * @since 1.1.0
- */
- protected abstract void doSnapshot(int step);
-
- /**
- * Take a snapshot of the selected performance measurements.
- *
- * @param step
- * this identifies the step that the snapshot is for
- *
- * @param types
- * This controls which measurements are selected. It is an or'd together list of the IPerformanceMonitor.Types constants.
- *
- * @see IPerformanceMonitor.Types
- */
- public void snapshot(int step, int types) {
- doSnapshot(step, types);
- if (listeners != null)
- notifySnapshot(new PerformanceEvent(this, step, types));
- }
-
- /**
- * Do the actual snapshot
- * @param step
- *
- * @see #snapshot(int, int)
- * @since 1.1.0
- */
- protected abstract void doSnapshot(int step, int types);
-
- /**
- * Add listener to list.
- * @param listener
- *
- * @since 1.1.0
- */
- public void addPerformanceListener(PerformanceListener listener) {
- if (findListener(listener) != -1)
- return;
- PerformanceListener[] newList = new PerformanceListener[listeners != null ? listeners.length+1 : 1];
- if (listeners != null)
- System.arraycopy(listeners, 0, newList, 0, listeners.length);
- newList[newList.length-1] = listener;
- listeners = newList;
- }
-
- private int findListener(PerformanceListener listener) {
- if (listeners != null) {
- for (int i = 0; i < listeners.length; i++) {
- if (listeners[i] == listener)
- return i;
- }
- }
- return -1;
- }
-
- /**
- * Remove the listener from the list.
- * @param listener
- *
- * @since 1.1.0
- */
- public void removePerformanceListener(PerformanceListener listener) {
- int index = findListener(listener);
- if (index != -1) {
- if (listeners.length == 1) {
- listeners = null;
- return;
- }
- PerformanceListener[] newList = new PerformanceListener[listeners.length-1];
- System.arraycopy(listeners, 0, newList, 0, index);
- System.arraycopy(listeners, index+1, newList, index, newList.length-index);
- listeners = newList;
- }
- }
- /**
- * Upload the results to the server. This causes the file to be
- * closed, and the monitor to be placed into the finished state.
- *
- * This method can only be called if the uploadhost, uploadport and uploaduserid
- * have been configured before hand.
- *
- * @param description an optional description (it can be null)
- *
- */
- public boolean upload(String description){return false;}
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java
deleted file mode 100644
index d021cd5..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util;
-import org.eclipse.perfmsr.core.IPerformanceMonitor;
-import org.eclipse.perfmsr.core.PerfMsrCorePlugin;
-
-/**
- * This is the version used when the performance plugin is available.
- *
- * <p>
- * This class is not meant to be instantiated by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public class PresentPerformanceMonitor extends PerformanceMonitorUtil {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#upload(java.lang.String)
- */
- public boolean upload(String description) {
- return monitor.upload(description).success;
- }
-
- private IPerformanceMonitor monitor;
-
- /*
- * So that only instantiated by this package.
- */
- PresentPerformanceMonitor() {
- monitor = PerfMsrCorePlugin.getPerformanceMonitor(true);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#isValid()
- */
- protected boolean isValid() {
- return monitor != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#setVar(java.lang.String)
- */
- public void setVar(String var) {
- monitor.setVar(var);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int)
- */
- protected void doSnapshot(int step) {
- monitor.snapshot(step);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int, int)
- */
- protected void doSnapshot(int step, int types) {
- monitor.snapshot(step, types);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
deleted file mode 100644
index 37e8277..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: RegistryReader.java,v $$
- * $$Revision: 1.5 $$ $$Date: 2006/05/17 20:13:45 $$
- */
-package org.eclipse.jem.util;
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Class to read a registry. It is meant to be subclassed to provide specific function.
- *
- * @since 1.0.0
- */
-public abstract class RegistryReader {
-
- String pluginId;
-
- String extensionPointId;
-
- private static Bundle systemBundle;
-
- /**
- * Utility method to get the plugin id of a configuation element
- *
- * @param configurationElement
- * @return plugin id of configuration element
- * @since 1.0.0
- */
- public static String getPluginId(IConfigurationElement configurationElement) {
- String pluginId = null;
-
- if (configurationElement != null) {
- IExtension extension = configurationElement.getDeclaringExtension();
-
- if (extension != null)
- pluginId = extension.getContributor().getName();
- }
-
- return pluginId;
- }
-
- /**
- * Constructor for RegistryReader taking a registry, plugin id, and extension point id.
- *
- * @param registry
- * @param pluginID
- * @param extensionPoint
- *
- * @deprecated Use RegistryReader(plugin, extensionPoint) instead. The registry passed in is ignored.
- * @since 1.0.0
- */
- public RegistryReader(IPluginRegistry registry, String pluginID, String extensionPoint) {
- this(pluginID, extensionPoint);
- }
-
- /**
- * Constructor for RegistryReader taking the plugin id and extension point id.
- *
- * @param pluginID
- * @param extensionPoint
- *
- * @since 1.0.0
- */
- public RegistryReader(String pluginID, String extensionPoint) {
- super();
- this.pluginId = pluginID;
- extensionPointId = extensionPoint;
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- Logger.getLogger().logError(buf.toString());
- }
-
- /*
- * Logs a very common registry error when a required attribute is missing.
- */
- protected void logMissingAttribute(IConfigurationElement element, String attributeName) {
- logError(element, "Required attribute '" + attributeName + "' not defined"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /*
- * Implement this method to read element attributes. If this element has subelements, the reader will recursively cycle through them and call this
- * method so don't do it here.
- */
- public abstract boolean readElement(IConfigurationElement element);
-
- /**
- * Read the extension point and parse it.
- *
- * @since 1.0.0
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(pluginId, extensionPointId);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- /**
- * Tests to see if it is valid at this point in time to create an executable extension. A valid reason not to would be that the workspace is
- * shutting donw.
- *
- * @param element
- * @return <code>true</code> if it is valid point to create an executable extension.
- *
- * @since 1.0.0
- */
- public static boolean canCreateExecutableExtension(IConfigurationElement element) {
- if (Platform.isRunning() && getSystemBundle().getState() != Bundle.STOPPING)
- return true;
- return false;
- }
-
- /**
- * Get the system bundle
- *
- * @return system bundle.
- *
- * @since 1.0.0
- */
- protected static Bundle getSystemBundle() {
- if (systemBundle == null)
- systemBundle = Platform.getBundle("org.eclipse.osgi"); //$NON-NLS-1$
- return systemBundle;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
deleted file mode 100644
index 7524f78..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util;
-
-import java.text.NumberFormat;
-import java.util.*;
-
-/**
- *
- * @since 1.0.2
- */
-public class TimerTests {
-
- /**
- * Default TimerTests class to use when not using your own. It's a global.
- */
- public static TimerTests basicTest = new TimerTests();
-
- public static final String CURRENT_PARENT_ID = "current parent"; //$NON-NLS-1$
- protected String currentParentId = null;
-
-
- protected static class TimerStep {
- static final int START = 0;
- static final int STOP = 1;
- static final int START_CUMULATIVE = 2;
- static final int STOP_CUMULATIVE = 3;
- static final int START_ACCUMULATING = 4;
- static final int STOP_ACCUMULATING = 5;
- protected String id;
- protected int type;
- protected long currentTime;
- protected int threadId;
-}
-
- protected boolean testOn = false;
- protected List steps;
-
- public synchronized boolean startStep(String id) {
- if (!testOn)
- return true;
-
- TimerStep step = createTimerStep(id, TimerStep.START);
- return step != null;
- }
-
- protected TimerStep createTimerStep(String id, int stepType) {
- TimerStep newStep = new TimerStep();
- newStep.threadId = Thread.currentThread().hashCode();
- newStep.id = id;
- newStep.type = stepType;
- newStep.currentTime = System.currentTimeMillis();
- steps.add(newStep);
-
- return newStep;
- }
-
- public synchronized boolean stopStep(String id) {
- if (!testOn)
- return true;
- TimerStep step = createTimerStep(id, TimerStep.STOP);
- return step != null;
- }
-
- public synchronized boolean startAccumulating(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.START_ACCUMULATING) != null;
- }
-
- public synchronized boolean stopAccumulating(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.STOP_ACCUMULATING) != null;
- }
- public synchronized boolean startCumulativeStep(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.START_CUMULATIVE) != null;
- }
-
- public synchronized boolean stopCumulativeStep(String id) {
- if (!testOn)
- return true;
- return createTimerStep(id, TimerStep.STOP_CUMULATIVE) != null;
- }
-
- /**
- * Clear the tests so that you can restart and do some more tests.
- *
- *
- * @since 1.0.2
- */
- public synchronized void clearTests() {
- if (!testOn)
- return;
- steps.clear();
- currentParentId = null;
- }
-
- /**
- * Turn this test on. If not turned on then all calls will quickly return with no errors. This allows the code to stay in place even when not
- * debugging.
- * <p>
- * When turned off, it will clear the test.
- *
- * @param on
- *
- * @since 1.0.2
- */
- public synchronized void testState(boolean on) {
- if (on == testOn)
- return;
- if (on) {
- testOn = true;
- if (steps == null)
- steps = new ArrayList();
- } else {
- testOn = false;
- steps = null;
- }
- currentParentId = null;
- }
- private static class CumulativeInformation {
- public TimerStep currentCumulativeStep;
- public long cumTime;
- public int cumCount;
- public int cumCountNonZero;
- public long maxTime;
- public long minTime = Integer.MAX_VALUE;
- public long minTimeNonZero = Integer.MAX_VALUE;
- }
- public synchronized void printIt() {
- if (!testOn)
- return;
- if (steps == null)
- return;
- Map stepInfoByThreadId = new HashMap();
- Map indentsByThreadId = new HashMap();
- Map cumSteps;
- TimerStep prevStep = null;
- TimerStep startStep;
- NumberFormat percentFormatter = NumberFormat.getPercentInstance();
- double totalTime = 0;
- StringBuffer strb = new StringBuffer(150);
- if (steps.size() > 2){
- totalTime = ((TimerStep)steps.get(steps.size()-1)).currentTime - ((TimerStep)steps.get(0)).currentTime;
- }
- for (int i = 0; i < steps.size(); i++) {
- TimerStep step = (TimerStep) steps.get(i);
- Integer threadId = new Integer(step.threadId);
- switch (step.type) {
- case TimerStep.START:
- case TimerStep.STOP:
- Integer threadIndent = (Integer) indentsByThreadId.get(threadId);
- int indent = 0;
- if (step.type == TimerStep.START) {
- if (threadIndent != null)
- indent = threadIndent.intValue() + 1;
- indentsByThreadId.put(threadId, new Integer(indent));
- } else {
- if (threadIndent != null)
- indent = threadIndent.intValue();
- if (indent > 0)
- indentsByThreadId.put(threadId, new Integer(indent - 1));
- else {
- indentsByThreadId.remove(threadId);
- indent = 0;
- }
- }
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t"); //$NON-NLS-1$
- for (int j = 0; j < indent; j++) {
- strb.append(" "); //$NON-NLS-1$
- }
- switch (step.type) {
- case TimerStep.START:
- strb.append("Start"); //$NON-NLS-1$
- break;
-
- case TimerStep.STOP:
- strb.append("Stop "); //$NON-NLS-1$
- break;
- default:
- break;
- }
- ;
- strb.append(" \""); //$NON-NLS-1$
- strb.append(step.id);
- strb.append("\" id("); //$NON-NLS-1$
- strb.append(step.threadId);
- strb.append(")"); //$NON-NLS-1$
- Map startSteps = (Map) stepInfoByThreadId.get(threadId);
- if (startSteps == null)
- stepInfoByThreadId.put(threadId, startSteps = new HashMap());
- if (step.type == TimerStep.START) {
- // Store the start step for later lookup when calulating the total time
- startSteps.put(step.id, step);
- } else {
- // This is the stop time for a step. We need to find
- // the corresponding start time and calculate the total time.
- Object item = startSteps.remove(step.id);
- if (item instanceof TimerStep) {
- startStep = (TimerStep) item;
- if (startStep != null) {
- int addchars = 100 - strb.length();
- for (int j = 0; j < addchars; j++) {
- strb.append(" "); //$NON-NLS-1$
- }
- long delta = step.currentTime - startStep.currentTime;
- strb.append(" Total = " + delta + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
- if (totalTime > 0)
- strb.append(" " + percentFormatter.format(delta/totalTime)); //$NON-NLS-1$
- }
- } else
- strb.append(" ---> Couldn't find Starting point for \"" + step.id + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
- prevStep = step;
- System.out.println(strb);
- break;
-
- case TimerStep.START_ACCUMULATING:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps == null)
- stepInfoByThreadId.put(threadId, cumSteps = new HashMap());
- cumSteps.put(step.id, new CumulativeInformation());
- threadIndent = (Integer) indentsByThreadId.get(threadId);
- indent = 0;
- if (threadIndent != null)
- indent = threadIndent.intValue();
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t"); //$NON-NLS-1$
- for (int j = 0; j < indent; j++) {
- strb.append(" "); //$NON-NLS-1$
- }
- strb.append("Start Accumulating"); //$NON-NLS-1$
- strb.append(" \""); //$NON-NLS-1$
- strb.append(step.id);
- strb.append("\" id("); //$NON-NLS-1$
- strb.append(step.threadId);
- strb.append(")"); //$NON-NLS-1$
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
- prevStep = step;
- System.out.println(strb);
- break;
-
- case TimerStep.START_CUMULATIVE:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation)
- ((CumulativeInformation) info).currentCumulativeStep = step;
- }
- break;
-
- case TimerStep.STOP_CUMULATIVE:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation) {
- CumulativeInformation cumInfo = (CumulativeInformation) info;
- if (cumInfo.currentCumulativeStep != null) {
- cumInfo.cumCount++;
- long delta = step.currentTime - cumInfo.currentCumulativeStep.currentTime;
- cumInfo.cumTime += delta;
- if (cumInfo.maxTime < delta)
- cumInfo.maxTime = delta;
- if (delta < cumInfo.minTime)
- cumInfo.minTime = delta;
- if (delta != 0) {
- cumInfo.cumCountNonZero++;
- if (delta < cumInfo.minTimeNonZero)
- cumInfo.minTimeNonZero = delta;
- }
- }
- }
- }
- break;
-
- case TimerStep.STOP_ACCUMULATING:
- threadIndent = (Integer) indentsByThreadId.get(threadId);
- indent = 0;
- if (threadIndent != null)
- indent = threadIndent.intValue();
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t"); //$NON-NLS-1$
- for (int j = 0; j < indent; j++) {
- strb.append(" "); //$NON-NLS-1$
- }
- strb.append("Stop Accumulating"); //$NON-NLS-1$
- strb.append(" \""); //$NON-NLS-1$
- strb.append(step.id);
- strb.append("\" id("); //$NON-NLS-1$
- strb.append(step.threadId);
- strb.append(")"); //$NON-NLS-1$
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation) {
- CumulativeInformation cumInfo = (CumulativeInformation) info;
- if (cumInfo.currentCumulativeStep != null) {
- strb.append(" cumulative time="); //$NON-NLS-1$
- strb.append(cumInfo.cumTime);
- strb.append(" cumulative count="); //$NON-NLS-1$
- strb.append(cumInfo.cumCount);
- strb.append(" max time="); //$NON-NLS-1$
- strb.append(cumInfo.maxTime);
- strb.append(" min time="); //$NON-NLS-1$
- strb.append(cumInfo.minTime);
- strb.append(" avg time="); //$NON-NLS-1$
- strb.append(((double) cumInfo.cumTime)/cumInfo.cumCount);
- strb.append(" NonZero times: cumulative ~0 count="); //$NON-NLS-1$
- strb.append(cumInfo.cumCountNonZero);
- if (cumInfo.cumCountNonZero != 0) {
- strb.append(" min ~0 time="); //$NON-NLS-1$
- strb.append(cumInfo.minTimeNonZero);
- strb.append(" avg ~0 time="); //$NON-NLS-1$
- strb.append(((double) cumInfo.cumTime) / cumInfo.cumCountNonZero);
- }
- }
- }
- }
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
- prevStep = step;
- System.out.println(strb);
- break;
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
deleted file mode 100644
index 8955882..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: UIContextDetermination.java,v $$
- * $$Revision: 1.5 $$ $$Date: 2007/04/10 01:09:36 $$
- */
-package org.eclipse.jem.util;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Static utility class for UIContext determination.
- *
- * @since 1.0.0
- */
-public class UIContextDetermination {
-
- private static final int UNKNOWN = 100;
-
- public static final String HEADLESS_CONTEXT_LITERAL = "Headless"; //$NON-NLS-1$
-
- public static final String UI_CONTEXT_LITERAL = "UI"; //$NON-NLS-1$
-
- public static final int HEADLESS_CONTEXT = 102;
-
- public static final int UI_CONTEXT = 101;
-
- private static Map cachedExtensions = null;
-
- private static int currentContext = UNKNOWN;
-
- private UIContextDetermination() {
- }
-
- /**
- * Returns an instance of a given class based on the UI or Headless context.
- *
- * @param key
- * @return new class instance for the given key.
- * @throws IllegalArgumentException
- * If the key is invalid (e.g. no extension is found for the key)
- */
- public static Object createInstance(String key) {
- Object result = null;
- if (cachedExtensions == null)
- initExtensions();
- IConfigurationElement contextSensitiveClass = (IConfigurationElement) cachedExtensions.get(key);
- try {
- if (contextSensitiveClass != null)
- result = contextSensitiveClass
- .createExecutableExtension(UIContextDeterminationRegistryReader.UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR);
- } catch (CoreException e) {
- Logger.getLogger().logError("Problem loading extension not found for key \"" + key + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- Logger.getLogger().logError(e);
- }
- if (result == null)
- Logger.getLogger().logError("Extension not found for key \"" + key + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- return result;
- }
-
- /**
- * Returns the current context -- determines the value if necessary.
- *
- * @return current context
- * @see #HEADLESS_CONTEXT
- * @see #UI_CONTEXT
- */
- public static int getCurrentContext() {
- if (currentContext == UNKNOWN) {
- currentContext = HEADLESS_CONTEXT;
- new UITesterRegistryReader().readRegistry();
- }
- return currentContext;
- }
-
- /*
- * Invokes the UIContextDeterminationRegistryReader to cache all of the extensions, if necessary.
- *
- */
- private static void initExtensions() {
- if (cachedExtensions == null) {
- cachedExtensions = new HashMap();
- new UIContextDeterminationRegistryReader().readRegistry();
- }
- }
-
- /*
- * Converts the input to one of UI_CONTEXT or HEADLESS_CONTEXT. Defaults to HEADLESS on invalid input
- *
- * @param literal @return
- */
- private static int convertLiteral(String literal) {
- return (UI_CONTEXT_LITERAL.equals(literal)) ? UI_CONTEXT : HEADLESS_CONTEXT;
- }
-
- /*
- * Reads the registration of UI Context-sensitive class extensions and initializes the cache of the UIContextDetermination object.
- *
- * @author mdelder
- */
- private static class UIContextDeterminationRegistryReader extends RegistryReader {
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_ELEMENT = "uiContextSensitiveClass"; //$NON-NLS-1$
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR = "key"; //$NON-NLS-1$
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR = "className"; //$NON-NLS-1$
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR = "context"; //$NON-NLS-1$
-
- public UIContextDeterminationRegistryReader() {
- super(JEMUtilPlugin.PLUGIN_ID, JEMUtilPlugin.UI_CONTEXT_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- boolean result = false;
- if (element.getName().equals(UI_CONTEXT_SENSTIVE_CLASS_ELEMENT)) {
-
- String key = element.getAttribute(UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR);
- String context = element.getAttribute(UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR);
-
- if (!cachedExtensions.containsKey(key) || getCurrentContext() == convertLiteral(context))
- cachedExtensions.put(key, element);
- result = true;
- }
- return result;
- }
- }
-
- /*
- * Reads the uiTester extension and instantiate the any of the UITester classes it finds.
- *
- * The implementation has the side effect that if multiple UITesters are registered, any of them can trip the currentContext into the UI_CONTEXT
- * state.
- *
- * @author mdelder
- */
- private static class UITesterRegistryReader extends RegistryReader {
-
- public static final String UI_TESTER_ELEMENT = "uiTester"; //$NON-NLS-1$
-
- public static final String UI_TESTER_CLASSNAME_ATTR = "className"; //$NON-NLS-1$
-
- public UITesterRegistryReader() {
- super(JEMUtilPlugin.PLUGIN_ID, JEMUtilPlugin.UI_TESTER_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf.workbench.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- boolean result = false;
- if (element.getName().equals(UI_TESTER_ELEMENT)) {
- result = true;
- try {
- // Don't bother running tester it if we already processed one extension that returned true.
- if (currentContext != UI_CONTEXT && canCreateExecutableExtension(element)) {
- UITester tester = (UITester) element.createExecutableExtension(UI_TESTER_CLASSNAME_ATTR);
- if (tester.isCurrentContextUI())
- currentContext = UI_CONTEXT;
- }
- } catch (Exception t) {
- Logger.getLogger().log("UIContextDetermination is proceeding in HEADLESS mode"); //$NON-NLS-1$
- }
- }
- return result;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java
deleted file mode 100644
index 54517e8..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jem.util;
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: UITester.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-/**
- * Interface for a UITester. The "classname" attribute on the "uiTester" extension point should implement this class.
- *
- * @since 1.0.0
- */
-public interface UITester {
-
- /**
- * Answer if the current context is an UI context.
- *
- * @return <code>true</code> if an UI context.
- *
- * @since 1.0.0
- */
- public boolean isCurrentContextUI();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java
deleted file mode 100644
index bedff60..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchContextBase.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.jem.internal.util.emf.workbench.*;
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * ContextBase for EMFWorkbench.
- *
- * <p>
- * This is meant to be subclassed as needed for additional or override function. It will be instantiated by default.
- * </p>
- *
- * @since 1.0.0
- */
-public class EMFWorkbenchContextBase {
-
- protected IProject project;
-
- protected ProjectResourceSet resourceSet;
-
- /**
- * Construct with a project.
- *
- * @param aProject
- *
- * @since 1.0.0
- */
- public EMFWorkbenchContextBase(IProject aProject) {
- if (aProject == null)
- throw new IllegalArgumentException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_1")); //$NON-NLS-1$
- project = aProject;
- }
-
- /**
- * Dispose of the context base.
- *
- *
- * @since 1.0.0
- */
- public void dispose() {
- if (resourceSet != null)
- resourceSet.release();
- resourceSet = null;
- project = null;
- }
-
- /**
- * Get the project this context is associated with.
- *
- * @return project
- *
- * @since 1.0.0
- */
- public IProject getProject() {
- return project;
- }
-
- /**
- * Return the resource set (creating if needed) for context.
- *
- * @return resource set
- *
- * @since 1.0.0
- */
- public ProjectResourceSet getResourceSet() {
- if (resourceSet == null) {
- resourceSet = createResourceSet();
- initializeResourceSet(resourceSet);
- }
- return resourceSet;
- }
-
- /**
- * Used for optimization; answer whether a resourceSet has been created
- *
- * @return <code>true</code> if a resource set has been created.
- *
- * @since 1.0.0
- */
- public boolean hasResourceSet() {
- return resourceSet != null;
- }
-
- /**
- * Initialize the resource set.
- *
- * @param aResourceSet
- *
- * @since 1.0.0
- */
- protected void initializeResourceSet(ProjectResourceSet aResourceSet) {
- createResourceSetSynchronizer(aResourceSet);
- aResourceSet.setURIConverter(createURIConverter(aResourceSet));
- aResourceSet.add(new WorkspaceResourceHandler());
- JEMUtilPlugin.getDefault().addExtendedResourceHandlers(aResourceSet);
-
- }
-
- /**
- * Create the resource set. By default it is a ProjectResourceSetImpl.
- *
- * @return project's new resource set.
- *
- * @since 1.0.0
- */
- protected ProjectResourceSet createResourceSet() {
- if (project == null)
- throw new IllegalStateException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_2")); //$NON-NLS-1$
- return new ProjectResourceSetImpl(project);
- }
-
- /**
- * Create a URIConverter for the resource set.
- *
- * @param aResourceSet
- * @return a uri converter.
- *
- * @since 1.0.0
- */
- protected WorkbenchURIConverter createURIConverter(ProjectResourceSet aResourceSet) {
- return new WorkbenchURIConverterImpl(getProject(), aResourceSet.getSynchronizer());
- }
-
- /**
- * Create a resource set workbench synchronizer.
- *
- * @param aResourceSet
- * @return a resource set workbench synchronizer.
- *
- * @since 1.0.0
- */
- protected ResourceSetWorkbenchSynchronizer createResourceSetSynchronizer(ProjectResourceSet aResourceSet) {
- return EMFWorkbenchContextFactory.INSTANCE.createSynchronizer(aResourceSet, getProject());
- }
-
- /**
- * Delete the resource from the workspace.
- *
- * @param aResource
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public void deleteResource(Resource aResource) throws CoreException {
- if (aResource != null)
- deleteFile(aResource);
- }
-
- /**
- * Delete the file associated with the resource.
- *
- * @param resource
- *
- * @since 1.0.0
- */
- public void deleteFile(Resource resource) {
- throw new UnsupportedOperationException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_0")); //$NON-NLS-1$
- }
-
- /**
- * Get resource (with the given URI) from the project resource set. Load it if not already loaded.
- *
- * @param uri
- * @return resource for the uri, or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public Resource getResource(URI uri) {
- return this.resourceSet.getResource(uri, true);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/FlexibleProjectResourceSet.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/FlexibleProjectResourceSet.java
deleted file mode 100644
index 1e231f0..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/FlexibleProjectResourceSet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-
-
-public interface FlexibleProjectResourceSet extends ProjectResourceSet {
-
-
- /**
- * Returns the resource resolved by the URI.
- * <p>
- * A resource set is expected to implement the following strategy
- * in order to resolve the given URI to a resource.
- * First it uses it's {@link #getURIConverter URI converter} to {@link URIConverter#normalize normalize} the URI
- * and then to compare it with the normalized URI of each resource;
- * if it finds a match,
- * that resource becomes the result.
- * Failing that,
- * it {@link org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#delegatedGetResource delegates}
- * to allow the URI to be resolved elsewhere.
- * For example,
- * the {@link org.eclipse.emf.ecore.EPackage.Registry#INSTANCE package registry}
- * is used to {@link org.eclipse.emf.ecore.EPackage.Registry#getEPackage resolve}
- * the {@link org.eclipse.emf.ecore.EPackage namespace URI} of a package
- * to the static instance of that package.
- * So the important point is that an arbitrary implementation may resolve the URI to any resource,
- * not necessarily to one contained by this particular resource set.
- * If the delegation step fails to provide a result,
- * and if <code>loadOnDemand</code> is <code>true</code>,
- * a resource is {@link org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandCreateResource created}
- * and that resource becomes the result.
- * If <code>loadOnDemand</code> is <code>true</code>
- * and the result resource is not {@link Resource#isLoaded loaded},
- * it will be {@link org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandLoad loaded} before it is returned.
- * </p>
- * @param uri the URI to resolve.
- * @param loadOnDemand whether to create and load the resource, if it doesn't already exists.
- * @param registeredFactory that is used to create resource if needed
- * @return the resource resolved by the URI, or <code>null</code> if there isn't one and it's not being demand loaded.
- * @throws RuntimeException if a resource can't be demand created.
- * @throws org.eclipse.emf.common.util.WrappedException if a problem occurs during demand load.
- * @since 2.1
- */
-
- Resource getResource(URI uri, boolean loadOnDemand, Factory registeredFactory);
-
- /**
- * Creates a new resource, of the appropriate type, and returns it.
- * <p>
- * It delegates to the resource factory {@link #getResourceFactoryRegistry registry}
- * to determine the {@link Resource.Factory.Registry#getFactory correct} factory,
- * and then it uses that factory to {@link Resource.Factory#createResource create} the resource
- * and add it to the {@link #getResources contents}.
- * If there is no registered factory, <code>null</code> will be returned;
- * when running within Eclipse,
- * a default XMI factory will be registered,
- * and this will never return <code>null</code>.
- * </p>
- * @param uri the URI of the resource to create.
- * @param resourceFactory
- * @return a new resource, or <code>null</code> if no factory is registered.
- */
-
- public Resource createResource(URI uri, Resource.Factory resourceFactory);
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java
deleted file mode 100644
index 465d7fa..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: IEMFContextContributor.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-/**
- * EMF Context Contributor interface. Implimenters are called to contribute to the context.
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase#createEMFContext(IProject, IEMFContextContributor)
- * @since 1.0.0
- */
-public interface IEMFContextContributor {
-
- /**
- * This is your opportunity to add a primary EMFNature. Typically you would add to the WorkbenchContext held by <code>aNature</code> in order to
- * change the container for the WorkbenchURIConverter or add adapter factories to the ResourceSet or anything else that is needed.
- *
- * @param aNature
- *
- * @since 1.0.0
- */
- void primaryContributeToContext(EMFWorkbenchContextBase aNature);
-
- /**
- * This is your opportunity to add a secondary EMFNature. Typically you would add to the WorkbenchContext held by <code>aNature</code> in order
- * to change the container for the WorkbenchURIConverter or add adapter factories to the ResourceSet or anything else that is needed.
- *
- * @param aNature
- *
- * @since 1.0.0
- */
- void secondaryContributeToContext(EMFWorkbenchContextBase aNature);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java
deleted file mode 100644
index f70dd1e..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ISynchronizerExtender.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-/**
- * Implimenters allows clients, eg {@link org.eclipse.jem.util.emf.workbench.EMFNatureContributor}, to extend the behavior of the
- * ResourceSetWorkbenchSynchronizer.
- *
- * @see org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer#addExtender(ISynchronizerExtender)
- * @since 1.0.0
- */
-public interface ISynchronizerExtender {
-
- /**
- * Notification that project has changed.
- *
- * @param delta
- *
- * @since 1.0.0
- */
- void projectChanged(IResourceDelta delta);
-
- /**
- * Notification that project has been closed.
- *
- *
- * @since 1.0.0
- */
- void projectClosed();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java
deleted file mode 100644
index 2c97699..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectResourceSet.java,v $$
- * $$Revision: 1.5 $$ $$Date: 2007/08/30 02:37:05 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * A ResourceSet for an entire project. It allows sharing of resources from multiple editors/viewers for a project.
- * <p>
- * An additional Notification type is sent out by ProjectResourceSet's of project resource set about to be released. A release is
- * called when projects are about to be closed. They release all of the resources and unload them. This notification can be used
- * to know that this is about to happen and to do something before the resources become invalid. It will be sent out just before the
- * resource set will be released.
- *
- * @see ProjectResourceSet#SPECIAL_NOTIFICATION_TYPE
- * @see ProjectResourceSet#PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID
- * @since 1.0.0
- */
-
-public interface ProjectResourceSet extends ResourceSet {
-
- IProject getProject();
-
- /**
- * Notification type in notifications from the ProjectResourceSet for
- * special notifications, and not the standard ones from ResourceSet.
- *
- * @see org.eclipse.emf.common.notify.Notification#getEventType()
- * @since 1.1.0
- */
- static int SPECIAL_NOTIFICATION_TYPE = Notification.EVENT_TYPE_COUNT+4;
-
- /**
- * Notification Feature ID for resource set about to be released.
- * Use {@link org.eclipse.emf.common.notify.Notification#getFeatureID(java.lang.Class)} to
- * get this id. The getFeature() on notification will return null.
- *
- * @since 1.1.0
- */
- static int PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID = 1000;
-
- /**
- * Call when the ResourceSet is no longer to be used.
- *
- *
- * @since 1.0.0
- */
- void release();
-
- /**
- * Add the <code>resourceHandler</code> to the end of the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @return boolean Return <code>true</code> if it was added.
- * @since 1.0.0
- */
- boolean add(ResourceHandler resourceHandler);
-
- /**
- * Add the <code>resourceHandler</code> to the front of the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @since 1.0.0
- */
- void addFirst(ResourceHandler resourceHandler);
-
- /**
- * Remove the <code>resourceHandler</code> from the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @return boolean Return true if it was removed.
- * @since 1.0.0
- */
- boolean remove(ResourceHandler resourceHandler);
-
- /**
- * Return the ResourceSet synchronizer that will synchronize the ResourceSet with changes from the Workbench.
- *
- * @return ResourceSetWorkbenchSynchronizer
- * @since 1.0.0
- */
- ResourceSetWorkbenchSynchronizer getSynchronizer();
-
- /**
- * Set the ResourceSet synchronizer that will synchronize the ResourceSet with changes from the Workbench.
- *
- * @param aSynchronizer
- * @return ResourceSetWorkbenchSynchronizer
- * @since 1.0.0
- */
- void setSynchronizer(ResourceSetWorkbenchSynchronizer aSynchronizer);
-
- /**
- * This should be called by clients whenever the structure of the project changes such that any cached URIs will be invalid. For example, if the
- * source folders within the URIConverter change.
- *
- * @since 1.0.0
- */
- void resetNormalizedURICache();
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
deleted file mode 100644
index eae2e81..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
+++ /dev/null
@@ -1,775 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectUtilities.java,v $$
- * $$Revision: 1.6 $$ $$Date: 2008/03/05 19:43:18 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * EMF Workbench Project Utilities.
- *
- * @since 1.0.0
- */
-
-public class ProjectUtilities {
-
- /**
- * Project control file name in project.
- *
- * @since 1.0.0
- */
- public final static String DOT_PROJECT = ".project"; //$NON-NLS-1$
-
- /**
- * Classpath control file name in project.
- *
- * @since 1.0.0
- */
- public final static String DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
-
- public ProjectUtilities() {
- }
-
- /**
- * Add the nature id to the project ahead of all other nature ids.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 1, prevNatures.length);
- newNatures[0] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * Add the nature id after all of the other nature ids for the project.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addNatureToProjectLast(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * Remove the nature id from the project.
- *
- * @param project
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void removeNatureFromProject(IProject project, String natureId) throws CoreException {
- IProjectDescription description = project.getDescription();
- String[] prevNatures = description.getNatureIds();
- int size = prevNatures.length;
- int newsize = 0;
- String[] newNatures = new String[size];
- boolean matchfound = false;
- for (int i = 0; i < size; i++) {
- if (prevNatures[i].equals(natureId)) {
- matchfound = true;
- continue;
- } else
- newNatures[newsize++] = prevNatures[i];
- }
- if (!matchfound)
- throw new CoreException(new Status(IStatus.ERROR, JEMUtilPlugin.ID, 0,
- "The nature id " + natureId + " does not exist on the project " + project.getName(), null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- else {
- String[] temp = newNatures;
- newNatures = new String[newsize];
- System.arraycopy(temp, 0, newNatures, 0, newsize);
- description.setNatureIds(newNatures);
- project.setDescription(description, null);
- }
- }
-
- /**
- * Add the list of projects to end of the "referenced projects" list from the project's description.
- *
- * @param project
- * @param toBeAddedProjectsList
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addReferenceProjects(IProject project, List toBeAddedProjectsList) throws CoreException {
-
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- for (int i = 0; i < toBeAddedProjectsList.size(); i++) {
- projectsList.add(toBeAddedProjectsList.get(i));
- }
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Add the single project to the end of the "referenced projects" list from the project's description.
- *
- * @param project
- * @param projectToBeAdded
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addReferenceProjects(IProject project, IProject projectToBeAdded) throws CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- projectsList.add(projectToBeAdded);
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Force a an immediate build of the project.
- *
- * @param project
- * @param progressMonitor
- *
- * @since 1.0.0
- */
- public static void forceAutoBuild(IProject project, IProgressMonitor progressMonitor) {
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, progressMonitor);
- } catch (CoreException ce) {
- //Revisit: Need to use a Logger
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Return if auto build is turned on.
- *
- * @return <code>true</code> if auto build is turned on.
- *
- * @since 1.0.0
- */
- public static boolean getCurrentAutoBuildSetting() {
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- return wd.isAutoBuilding();
- }
-
- /**
- * Get the project associated with the given object.
- *
- * @param object
- * may be an <code>IProject, IResource, IAdaptable (to an IProject), EObject (gets IProject if object is in a ProjectResourceSet</code>.
- * @param natureId
- * if <code>null</code> then returns project. If not <code>null</code> then returns project only if project has this nature id.
- * @return project associated with the object or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Object object, String natureId) {
- IProject result = getProject(object);
- if (natureId == null)
- return result;
- if (result != null && result.isAccessible() && natureId != null)
- try {
- if (result.hasNature(natureId))
- return result;
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return null;
- }
-
- /**
- * Get the project associated with the given object.
- *
- * @param object
- * may be an <code>IProject, IResource, IAdaptable (to an IProject), EObject (gets IProject if object is in a ProjectResourceSet</code>.
- * @return project associated with the object or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Object object) {
- IProject result = null;
-
- if (object instanceof IProject)
- result = (IProject) object;
- else if (object instanceof IResource)
- result = ((IResource) object).getProject();
- else if (object instanceof IAdaptable)
- result = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
- else if (object instanceof EObject)
- result = getProject((EObject) object);
-
- return result;
- }
-
- /**
- * Get the project associated with the given EObject. (If in a ProjectResourceSet, then the project from that resource set).
- *
- * @param aRefObject
- * @return project if associated or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(EObject aRefObject) {
- if (aRefObject != null) {
- Resource resource = aRefObject.eResource();
- if (resource != null)
- return getProject(resource);
- }
- return null;
- }
-
- public static IFile getPlatformFile(URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri)) {
- String fileString = URI.decode(uri.path());
- fileString = fileString.substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
- return WorkbenchResourceHelperBase.getWorkspace().getRoot().getFile(new Path(fileString));
- }
- return null;
- }
-
- /**
- * Get the project associated with the given Resource. (If in a ProjectResourceSet, then the project from that resource set).
- *
- * @param resource
- * @return project if associated or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Resource resource) {
- ResourceSet set = resource == null ? null : resource.getResourceSet();
- if (set == null) {
- URI uri = resource.getURI();
- if (uri == null) return null;
- IFile file = getPlatformFile(resource.getURI());
- if (file == null)
- return null;
- return file.getProject();
- }
-
- if (set instanceof ProjectResourceSet)
- return ((ProjectResourceSet) set).getProject();
- URIConverter converter = set == null ? null : set.getURIConverter();
- if (converter != null && converter instanceof WorkbenchURIConverter && ((WorkbenchURIConverter) converter).getOutputContainer() != null)
- return ((WorkbenchURIConverter) converter).getOutputContainer().getProject();
- else
- return null;
- }
-
- /**
- * Remove the list of projects from the list of "referenced projects" in the project's description.
- *
- * @param project
- * @param toBeRemovedProjectList
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- public static void removeReferenceProjects(IProject project, List toBeRemovedProjectList) throws org.eclipse.core.runtime.CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- for (int i = 0; i < toBeRemovedProjectList.size(); i++) {
- projectsList.remove(toBeRemovedProjectList.get(i));
- }
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Remove the project from the list of "referenced projects" in the description for the given project.
- *
- * @param project
- * @param toBeRemovedProject
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- public static void removeReferenceProjects(IProject project, IProject toBeRemovedProject) throws org.eclipse.core.runtime.CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add((projects[i]));
- }
-
- projectsList.remove(toBeRemovedProject);
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Turn auto-building off.
- *
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOff() {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(false);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Turn auto-building on.
- *
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOn() {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(true);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Set the auto-building state.
- *
- * @param aBoolean
- * <code>true</code> to turn auto-building on.
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOn(boolean aBoolean) {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(aBoolean);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
-
- }
- }
-
- /**
- * Adds a builder to the build spec for the given project.
- *
- * @param builderID
- * The id of the builder.
- * @param project
- * Project to add to.
- * @return whether the builder id was actually added (it may have already existed)
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean addToBuildSpec(String builderID, IProject project) throws CoreException {
- return addToBuildSpecBefore(builderID, null, project);
- }
-
- /**
- * Adds a builder to the build spec for the given project, immediately before the specified successor builder.
- *
- * @param builderID
- * The id of the builder.
- * @param successorID
- * The id to put the builder before.
- * @return whether the builder id was actually added (it may have already existed)
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean addToBuildSpecBefore(String builderID, String successorID, IProject project) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (!found) {
- boolean successorFound = false;
- ICommand command = description.newCommand();
- command.setBuilderName(builderID);
- ICommand[] newCommands = new ICommand[commands.length + 1];
- for (int j = 0, index = 0; j < commands.length; j++, index++) {
- if (successorID != null && commands[j].getBuilderName().equals(successorID)) {
- successorFound = true;
- newCommands[index++] = command;
- }
- newCommands[index] = commands[j];
- }
- if (!successorFound)
- newCommands[newCommands.length - 1] = command;
- description.setBuildSpec(newCommands);
- project.setDescription(description, null);
- }
- return !found;
- }
-
- /**
- * Remove the builder from the build spec.
- *
- * @param builderID
- * The id of the builder.
- * @param project
- * Project to remove from.
- * @return boolean if the builder id was found and removed
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean removeFromBuildSpec(String builderID, IProject project) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (found) {
- ICommand[] newCommands = new ICommand[commands.length - 1];
- int newCount = 0;
- for (int i = 0; i < commands.length; ++i) {
- if (!(commands[i].getBuilderName().equals(builderID))) {
- //Add the existng to the new array
- newCommands[newCount] = commands[i];
- newCount++;
- }
- }
-
- description.setBuildSpec(newCommands);
- project.setDescription(description, null);
-
- }
- return found;
-
- }
-
- /**
- * Ensure the container is not read-only.
- * <p>
- * For Linux, a Resource cannot be created in a ReadOnly folder. This is only necessary for new files.
- *
- * @param resource
- * workspace resource to make read/write
- * @since 1.0.0
- */
- public static void ensureContainerNotReadOnly(IResource resource) {
- if (resource != null && !resource.exists()) { //it must be new
- IContainer container = resource.getParent();
- ResourceAttributes attr = container.getResourceAttributes();
- while (attr != null && !attr.isReadOnly()) {
- container = container.getParent();
- if (container == null)
- break;
- attr = container.getResourceAttributes();
- }
- if (container != null && attr != null)
- attr.setReadOnly(false);
- }
- }
-
- /**
- * Get projects from primary nature.
- *
- * @param natureID
- * @return All projects that have the given nature id as the first nature id.
- *
- * @since 1.0.0
- */
- public static IProject[] getProjectsForPrimaryNature(String natureID) {
- IProject[] projectsWithNature = new IProject[] {};
- List result = new ArrayList();
- IProject[] projects = getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- if (isProjectPrimaryNature(projects[i], natureID))
- result.add(projects[i]);
- }
- return (IProject[]) result.toArray(projectsWithNature);
- }
-
- /**
- * Get all projects in the workspace
- *
- * @return all workspace projects
- *
- * @since 1.0.0
- */
- public static IProject[] getAllProjects() {
- return ResourcesPlugin.getWorkspace().getRoot().getProjects();
- }
-
- /**
- * Is this nature id the primary nature id for the project
- *
- * @param project
- * @param natureID
- * @return <code>true</code> if first nature id for the project.
- *
- * @since 1.0.0
- */
- public static boolean isProjectPrimaryNature(IProject project, String natureID) {
- String[] natures = null;
- try {
- natures = project.getDescription().getNatureIds();
- } catch (Exception e1) {
- }
- return (natures != null && natures.length > 0 && natures[0].equals(natureID));
- }
-
- protected static IPath createPath(IProject p, String defaultSourceName) {
- IPath path = new Path(p.getName());
- path = path.append(defaultSourceName);
- path = path.makeAbsolute();
- return path;
- }
-
- /**
- * Returns a list of existing files which will be modified if the classpath changes for the given proeject.
- *
- * @param p
- * project
- * @return list of affected files.
- *
- * @since 1.0.0
- */
- public static List getFilesAffectedByClasspathChange(IProject p) {
- List result = new ArrayList(2);
- addFileIfExists(p, result, DOT_CLASSPATH);
- addFileIfExists(p, result, DOT_PROJECT);
- return result;
- }
-
- protected static void addFileIfExists(IProject p, List aList, String filename) {
- IFile aFile = p.getFile(filename);
- if (aFile != null && aFile.exists())
- aList.add(aFile);
- }
-
- /**
- * Strip off a leading "/" from each project name in the array, if it has one.
- *
- * @param projecNames
- * @return array of project names with all leading '/' removed.
- *
- * @since 1.0.0
- */
- public static String[] getProjectNamesWithoutForwardSlash(String[] projecNames) {
- String[] projNames = new String[projecNames.length];
- List temp = java.util.Arrays.asList(projecNames);
- for (int i = 0; i < temp.size(); i++) {
- String name = (String) (temp.get(i));
- if (name.startsWith("/")) { //$NON-NLS-1$
- projNames[i] = name.substring(1, name.length());
- } else {
- projNames[i] = name;
- }
- }
- return projNames;
- }
-
- protected static URL createFileURL(IPath path) {
- try {
- return path.toFile().toURL();
- } catch (MalformedURLException e) {
- Logger.getLogger().log(e, Level.WARNING);
- return null;
- }
- }
-
- /**
- * Find first newObject that is not in the oldObjects array (using "==").
- *
- * @param oldObjects
- * @param newObjects
- * @return first newObject not found in oldObjects, or <code>null</code> if all found.
- *
- * @since 1.0.0
- */
- public static Object getNewObject(Object[] oldObjects, Object[] newObjects) {
- if (oldObjects != null && newObjects != null && oldObjects.length < newObjects.length) {
- for (int i = 0; i < newObjects.length; i++) {
- boolean found = false;
- Object object = newObjects[i];
- for (int j = 0; j < oldObjects.length; j++) {
- if (oldObjects[j] == object) {
- found = true;
- break;
- }
- }
- if (!found)
- return object;
- }
- }
- if (oldObjects == null && newObjects != null && newObjects.length == 1)
- return newObjects[0];
- return null;
- }
-
- /**
- * List of all files in the project.
- * <p>
- * Note: A more efficient way to do this is to use {@link IResource#accept(org.eclipse.core.resources.IResourceProxyVisitor, int)}
- *
- * @param 1.0.0
- * @return list of files in the project
- *
- * @see IResource#accept(org.eclipse.core.resources.IResourceProxyVisitor, int)
- * @since 1.0.0
- */
- public static List getAllProjectFiles(IProject project) {
- List result = new ArrayList();
- if (project == null)
- return result;
- try {
- result = collectFiles(project.members(), result);
- } catch (CoreException e) {
- }
- return result;
- }
-
- private static List collectFiles(IResource[] members, List result) throws CoreException {
- // recursively collect files for the given members
- for (int i = 0; i < members.length; i++) {
- IResource res = members[i];
- if (res instanceof IFolder) {
- collectFiles(((IFolder) res).members(), result);
- } else if (res instanceof IFile) {
- result.add(res);
- }
- }
- return result;
- }
-
- /**
- * Get the project.
- *
- * @param projectName
- * @return a IProject given the projectName
- * @since 1.0.0
- */
- public static IProject getProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- /**
- * Return whether the given builder name is attached to the project.
- *
- * @param project
- * @param builderName
- * @return <code>true</code> if builder name is attached to the project.
- *
- * @since 1.0.0
- */
- public static boolean hasBuilder(IProject project, String builderName) {
- try {
- ICommand[] builders = project.getDescription().getBuildSpec();
- for (int i = 0; i < builders.length; i++) {
- ICommand builder = builders[i];
- if (builder != null) {
- if (builder.getBuilderName().equals(builderName))
- return true;
- }
- }
- } catch (Exception e) {
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java
deleted file mode 100644
index 0170780..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ResourceHandler.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * Implementers of this interface are provide extension capabilities on resource set. Such as looking or creating in other resource sets for a
- * resource or an EObject.
- *
- * @see org.eclipse.jem.util.emf.workbench.ProjectResourceSet#add(ResourceHandler)
- * @since 1.0.0
- */
-public interface ResourceHandler {
-
- /**
- * Each ResourceHandler for a WorkbenchContext (which holds a ProjectResourceSet) will get an oportunity to get the Resource given the uriString
- * prior to the originatingResourceSet getting it in the normal manner.
- *
- * If this handler loaded a Resource in its create(ResourceSet, uriString) then this method should be able to return it as well.
- *
- * @param originatingResourceSet
- * @param uri
- * @return resource if found or <code>nulll/code> if this handler didn't find it.
- *
- * @since 1.0.0
- */
- Resource getResource(ResourceSet originatingResourceSet, URI uri);
-
- /**
- * Get the EObject for the given URI, if it can. Load the resource if loadOnDemand is <code>true</code>.
- *
- * @param originatingResourceSet
- * @param uri
- * uri of EObject being requested
- * @param loadOnDemand
- * <code>true</code> if resource should be loaded
- * @return eobject if found or <code>null</code> if not.
- */
- EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand);
-
- /**
- * Create the resource pointed to be the URI if this handler will handle it.
- *
- * @param originatingResourceSet
- * @param uri
- * @return resource if created, or <code>null</code> if handler doesn't handle this type.
- */
- Resource createResource(ResourceSet originatingResourceSet, URI uri);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java
deleted file mode 100644
index 1cec597..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ResourceSetWorkbenchSynchronizer.java,v $$
- * $$Revision: 1.4 $$ $$Date: 2006/05/17 20:13:45 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Synchronizer on the workbench. It listens for the project to see if it is closed or deleted. If it does it notifies this out.
- *
- * @since 1.0.0
- */
-public class ResourceSetWorkbenchSynchronizer implements IResourceChangeListener {
-
- protected IProject project;
-
- protected ResourceSet resourceSet;
-
- /** Extenders that will be notified after a pre build resource change */
- protected List extenders;
-
- /** The delta for this project that will be broadcast to the extenders */
- protected IResourceDelta currentProjectDelta;
-
- private int currentEventType = -1;
-
- /**
- * Constructor taking a resource set and project.
- *
- * @param aResourceSet
- * @param aProject
- *
- * @since 1.0.0
- */
- public ResourceSetWorkbenchSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- resourceSet = aResourceSet;
- project = aProject;
- if (aResourceSet != null && aResourceSet instanceof ProjectResourceSet)
- ((ProjectResourceSet) aResourceSet).setSynchronizer(this);
- initialize();
- }
-
- /**
- * Get the project for this synchronizer
- *
- * @return project
- *
- * @since 1.0.0
- */
- public IProject getProject() {
- return project;
- }
-
- /*
- * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- currentEventType = event.getType();
- currentProjectDelta = null;
- if ((currentEventType == IResourceChangeEvent.PRE_CLOSE || currentEventType == IResourceChangeEvent.PRE_DELETE)
- && event.getResource().equals(getProject())) {
- notifyExtendersOfClose();
- release();
- }
- }
-
-
- protected void notifyExtendersIfNecessary() {
- if (currentEventType != IResourceChangeEvent.POST_CHANGE || extenders == null || currentProjectDelta == null)
- return;
- for (int i = 0; i < extenders.size(); i++) {
- ISynchronizerExtender extender = (ISynchronizerExtender) extenders.get(i);
- extender.projectChanged(currentProjectDelta);
- }
- }
-
- protected void notifyExtendersOfClose() {
- if (extenders != null && !extenders.isEmpty()) {
- for (int i = 0; i < extenders.size(); i++) {
- ISynchronizerExtender extender = (ISynchronizerExtender) extenders.get(i);
- extender.projectClosed();
- }
- }
- }
-
- protected IWorkspace getWorkspace() {
- if (getProject() == null)
- return ResourcesPlugin.getWorkspace();
- return getProject().getWorkspace();
- }
-
- protected void initialize() {
- getWorkspace().addResourceChangeListener(this,
- IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_BUILD);
- }
-
- /**
- * Dispose of the synchronizer. Called when no longer needed.
- *
- *
- * @since 1.0.0
- */
- public void dispose() {
- getWorkspace().removeResourceChangeListener(this);
- }
-
- /**
- * The project is going away so we need to cleanup ourself and the ResourceSet.
- */
- protected void release() {
- if (JEMUtilPlugin.isActivated()) {
- try {
- if (resourceSet instanceof ProjectResourceSet)
- ((ProjectResourceSet) resourceSet).release();
- } finally {
- EMFWorkbenchContextFactory.INSTANCE.removeCachedProject(getProject());
- dispose();
- }
- }
- }
-
- /**
- * Add an extender to be notified of events.
- *
- * @param extender
- *
- * @since 1.0.0
- */
- public void addExtender(ISynchronizerExtender extender) {
- if (extenders == null)
- extenders = new ArrayList(3);
- extenders.add(extender);
- }
-
- /**
- * Remove extender from notification of events.
- *
- * @param extender
- *
- * @since 1.0.0
- */
- public void removeExtender(ISynchronizerExtender extender) {
- if (extenders == null)
- return;
- extenders.remove(extender);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getClass().getName() + '(' + ((getProject() != null) ? getProject().getName() : "null") + ')'; //$NON-NLS-1$
- }
-
- /**
- * Tell Synchronizer that a file is about to be saved. This method should be called prior to writing to an IFile from an EMF resource.
- * <p>
- * Default does nothing, but subclasses can do something.
- * </p>
- *
- * @param aFile
- * file about to be saved.
- *
- * @since 1.0.0
- */
- public void preSave(IFile aFile) {
- //Default is do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java
deleted file mode 100644
index 9d72f51..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchByteArrayOutputStream.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-/**
- * ByteArray OutputStream for the Workbench. It works with the synchronizer {@link org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer}to
- * notify of a save. It also changes all of the line separators to the current system line separator, i.e. if there are some '\r' and we are on
- * Windows(R) then they will be converted to '\n\r'), if the setting for the stream is to do eol conversion.
- *
- * @since 1.0.0
- */
-public class WorkbenchByteArrayOutputStream extends URIConverterImpl.PlatformResourceOutputStream {
-
- private boolean fConvertEOL = false;
-
- protected ResourceSetWorkbenchSynchronizer synchronizer;
-
- /**
- * Construct with an IFile
- *
- * @param aFile
- *
- * @since 1.0.0
- */
- public WorkbenchByteArrayOutputStream(IFile aFile) {
- this(aFile, null);
- }
-
- /**
- * Construct with a IFile and a synchronizer. This way synchronizer will know when file is about to be saved.
- *
- * @param aFile
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchByteArrayOutputStream(IFile aFile, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- super(aFile, false, true, null);
- synchronizer = aSynchronizer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#close()
- */
- public void close() throws IOException {
- if (synchronizer != null)
- synchronizer.preSave(file);
- super.close();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl.PlatformResourceOutputStream#flush()
- */
- public void flush() throws IOException {
- if (synchronizer != null)
- synchronizer.preSave(file);
- super.flush();
- }
-
- /*
- * Convert the end of line characters.
- */
- private int convertEOL(byte[] data) {
- // Algorithm:
- // Remove all '\r' chars
- // Replace all '\n' chars with line seperator chars
-
- String EOL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- byte[] EOLBytes = EOL.getBytes();
-
- int out = 0;
-
- for (int in = 0; in < data.length; in++) {
- if (data[in] == '\r') {
- // don't output (ie, throw the char away)
- } else if (data[in] == '\n') {
- // The code does not currently handle expanding the array
- if ((in - out + 1) < EOLBytes.length)
- throw new UnsupportedOperationException("WorkbenchByteArrayOutputStream: Expanding EOL chars not implemented"); //$NON-NLS-1$
-
- for (int i = 0; i < EOLBytes.length; i++) {
- data[out++] = EOLBytes[i];
- }
- } else {
- // Just copy the data
- data[out++] = data[in];
- }
- }
-
- return out;
- }
-
- /**
- * Is EOL conversion turned on.
- *
- * @return <code>true</code> if EOL conversion is turned on.
- *
- * @since 1.0.0
- */
- public boolean isConvertEOLChars() {
- return fConvertEOL;
- }
-
- /**
- * Set the EOL conversion flag.
- *
- * @param set
- * <code>true</code> if EOL should be converted to current line separator.
- *
- * @since 1.0.0
- */
- public void setConvertEOLChars(boolean set) {
- fConvertEOL = set;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.ByteArrayOutputStream#toByteArray()
- */
- public synchronized byte[] toByteArray() {
- byte[] contents = super.toByteArray();
- if (isConvertEOLChars())
- convertEOL(contents);
- return contents;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
deleted file mode 100644
index f526237..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
+++ /dev/null
@@ -1,695 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchResourceHelperBase.java,v $$
- * $$Revision: 1.6 $$ $$Date: 2008/03/12 14:21:39 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.*;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.internal.util.emf.workbench.WorkspaceResourceHandler;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Workbench resource helper
- *
- * @since 1.0.0
- */
-public class WorkbenchResourceHelperBase {
-
- /**
- * Everything is static, don't know why there is an instance here.
- */
- public static final WorkbenchResourceHelperBase INSTANCE = new WorkbenchResourceHelperBase();
-
- protected static WorkspaceResourceHandler workspaceURILoader = new WorkspaceResourceHandler();
-
- protected static void resolveContainedProxies(EObject refObject) {
- List contained = refObject.eContents();
- EObject mofObject;
- for (int i = 0; i < contained.size(); i++) {
- mofObject = (EObject) contained.get(i);
- resolveProxies(mofObject);
- }
- }
-
- protected static void resolveNonContainedProxies(EObject refObject) {
- List references = refObject.eClass().getEAllReferences();
- EReference reference;
- for (int i = 0; i < references.size(); i++) {
- reference = (EReference) references.get(i);
- if (!reference.isContainment()) {
- if (reference.isMany()) {
- List value = (List) refObject.eGet(reference);
- for (int j = 0; j < value.size(); j++)
- value.get(j);
- } else {
- refObject.eGet(reference);
- }
- }
- }
- }
-
- /**
- * Force all of the proxies with <code>resource</code> to be resolved.
- *
- * @param resource
- *
- * @since 1.0.0
- */
- public static void resolveProxies(Resource resource) {
- if (resource != null) {
- List topLevels = resource.getContents();
- EObject mofObject;
- for (int i = 0; i < topLevels.size(); i++) {
- mofObject = (EObject) topLevels.get(i);
- resolveProxies(mofObject);
- }
- }
- }
-
- /**
- * Return a List of proxies that are contained by the <code>resource</code>.
- *
- * @param resource
- * @return list of proxies.
- *
- * @since 1.0.0
- */
- public static List gatherProxies(Resource resource) {
- if (resource == null)
- return Collections.EMPTY_LIST;
- List list = new ArrayList();
- List topLevels = resource.getContents();
- int size = topLevels.size();
- EObject mofObject;
- for (int i = 0; i < size; i++) {
- mofObject = (EObject) topLevels.get(i);
- gatherProxies((InternalEObject) mofObject, list);
- }
- return list;
- }
-
- protected static void gatherProxies(InternalEObject refObject, List proxies) {
- if (refObject == null)
- return;
- List contains = refObject.eClass().getEAllContainments();
- if (contains != null) {
- int size = contains.size();
- EStructuralFeature sf = null;
- for (int i = 0; i < size; i++) {
- sf = (EStructuralFeature) contains.get(i);
- gatherProxies(refObject, sf, proxies);
- }
- }
- }
-
- protected static void gatherProxies(InternalEObject refObject, EStructuralFeature sf, List proxies) {
- Object value = null;
- InternalEObject proxy = null;
- if (sf.isMany() || refObject.eIsSet(sf)) {
- value = refObject.eGet(sf, false);
- if (value != null) {
- if (sf.isMany()) {
- Iterator j = ((InternalEList) value).basicIterator();
- while (j.hasNext()) {
- proxy = (InternalEObject) j.next();
- if (proxy.eIsProxy())
- proxies.add(proxy);
- }
- } else if (((InternalEObject) value).eIsProxy())
- proxies.add(value);
- }
- }
- }
-
- protected static void resolveProxies(EObject refObject) {
- if (refObject != null) {
- resolveNonContainedProxies(refObject);
- resolveContainedProxies(refObject);
- }
- }
-
- /**
- * Return an existing context base on <code>aProject</code>.
- *
- * @param aProject
- * @return the context base for the project or <code>null</code> if none.
- *
- * @since 1.0.0
- */
- public static EMFWorkbenchContextBase getEMFContext(IProject aProject) {
- return EMFWorkbenchContextFactory.INSTANCE.getEMFContext(aProject);
- }
-
- /**
- * Create a resource from the URI. The URI must contain the project name, either as the first segment, or if in platform resource url protocol.
- * {@link #getResourceSet(URI)}
- *
- * @param uri
- * @return a new resource for the uri or <code>null</code> if not a project uri
- *
- * @since 1.0.0
- */
- public static Resource createResource(URI uri) {
- ResourceSet set = getResourceSet(uri);
- if (set != null)
- return set.createResource(uri);
- return null;
- }
-
- /**
- * Check for a cached Resource for the given URI, if none is found, create a new Resource for with the URI against the proper ResourceSet.
- *
- * @param uri The URI MUST be either a "<b>platform:/resource/</b>project-name/...." type URI or it
- * must be of type "project-name/...". This method will only return resources that are workbench project resources.
- * Any other type of URI will cause <code>null</code> to be returned.
- * @return resource or <code>null</code> if not a project uri.
- *
- * @since 1.0.0
- */
- public static Resource getExistingOrCreateResource(URI uri) {
- return getExistingOrCreateResource(uri, getResourceSet(uri));
- }
-
- /**
- * Get the IFile for the URI. The URI must be a workbench project style URI.
- * @param uri The URI MUST be either a "<b>platform:/resource/</b>project-name/...." type URI or it
- * must be of type "project-name/...". This method will only return resources that are workbench project resources.
- * Any other type of URI will cause <code>null</code> to be returned.
- * @return the IFile if the URI is a project form, <code>null</code> if not a project form, OR the project doesn't exist. The IFile returned doesn't necessarily exist. Use {@link IFile#exists()} to test that.
- *
- * @since 1.2.0
- */
- public static IFile getIFile(URI uri) {
- IProject project = getProject(uri);
- if (project != null) {
- IPath path;
- if (isPlatformResourceURI(uri)) {
- // Need to get the path and remove the first two segments (/resource/project name/).
- path = new Path(URI.decode(uri.path())).removeFirstSegments(2);
- } else {
- // Need to get the path and remove the first segment (/project name/).
- path = new Path(URI.decode(uri.path())).removeFirstSegments(1);
- }
- return project.getFile(path);
- } else
- return null;
- }
-
- /**
- * Check for a cached Resource for the given URI, if none is found, create a new Resource for with the URI against the given ResourceSet.
- *
- * @param uri
- * @param set
- * @return resource or <code>null</code> if set was <code>null</code>.
- *
- * @since 1.0.0
- */
- public static Resource getExistingOrCreateResource(URI uri, ResourceSet set) {
- if (set != null) {
- Resource res = set.getResource(uri, false);
- if (res == null)
- res = set.createResource(uri);
- return res;
- } else
- return null;
- }
-
- /**
- * Return a new or existing context base on <code>aProject</code>. Allow the <code>contributor</code> to contribute to the new or existing
- * nature prior to returning.
- *
- * @param aProject
- * @param contributor
- * @return the context base for the project.
- *
- * @since 1.0.0
- */
- public static EMFWorkbenchContextBase createEMFContext(IProject aProject, IEMFContextContributor contributor) {
- return EMFWorkbenchContextFactory.INSTANCE.createEMFContext(aProject, contributor);
- }
-
- /**
- * Does the passed URI have the form platform:/resource/... ?
- *
- * @param uri
- * @return <code>true</code> if it is a platform resource protocol.
- *
- * @since 1.0.0
- */
- public static boolean isPlatformResourceURI(URI uri) {
- return JEMUtilPlugin.PLATFORM_PROTOCOL.equals(uri.scheme()) && JEMUtilPlugin.PLATFORM_RESOURCE.equals(uri.segment(0));
- }
-
- /**
- * This api may be used to cache a Resource if it has a URI that is Workspace relative. Return true if it is cached.
- *
- * @param aResource
- * @return <code>true</code> if it was successful to cache.
- *
- * @since 1.0.0
- */
- public static boolean cacheResource(Resource aResource) {
- if (aResource != null) {
- ResourceSet set = getResourceSet(aResource.getURI());
- if (set != null)
- return set.getResources().add(aResource);
- }
- return false;
- }
-
- /**
- * This api is used if you create a new MOF resource and you want to add it to the correct ResourceSet. In order to do that, we need the IProject
- * that you want aResource to be cached within as well as the IPath which is the full path of the location of the new Resource.
- *
- * @param aProject
- * @param aResource
- * @param fullPath
- * @return <code>true</code> if resource was cached.
- *
- * @since 1.0.0
- */
- public static boolean cacheResource(IProject aProject, Resource aResource, IPath fullPath) {
- if (aProject == null || aResource == null || !aProject.isAccessible())
- return false;
- ResourceSet set = getResourceSet(aProject);
- if (set != null) {
- URI converted = set.getURIConverter().normalize(aResource.getURI());
- if (converted != aResource.getURI())
- aResource.setURI(converted);
- return set.getResources().add(aResource);
- }
- return false;
- }
-
- /**
- * Get the path of the project resource relative to the workspace or relative to the list of containers in this project.
- *
- * @param aResource
- * @return path
- *
- * @since 1.0.0
- */
- public static String getActualProjectRelativeURI(IResource aResource) {
- if (aResource == null || !aResource.isAccessible())
- return null;
- IProject project = aResource.getProject();
- IPath path = getPathInProject(project, aResource.getFullPath());
- return path.makeRelative().toString();
- }
-
- /**
- * Return an IPath that can be used to load a Resource using the <code>fullPath</code>. This will be a project relative path.
- *
- * @param project
- * @param fullPath
- * @return path
- *
- * @since 1.0.0
- */
- public static IPath getPathInProject(IProject project, IPath fullPath) {
- List containers = getProjectURIConverterContainers(project);
- if (!containers.isEmpty())
- return getPathFromContainers(containers, fullPath);
- return fullPath;
- }
-
- protected static List getProjectURIConverterContainers(IProject project) {
- EMFWorkbenchContextBase nature = createEMFContext(project, null);
- if (nature != null) {
- WorkbenchURIConverter conv = (WorkbenchURIConverter) nature.getResourceSet().getURIConverter();
- if (conv != null)
- return conv.getInputContainers();
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * If this path is contained within one of the listed containers, then return the path relative to the container.
- *
- * @param containers
- * @param fullPath
- * @return path relative to a container, or unchanged path if not in a container.
- *
- * @since 1.0.0
- */
- public static IPath getPathFromContainers(List containers, IPath fullPath) {
- IContainer container = null;
- IPath result;
- int size = containers.size();
- int matching = -1;
- IPath containerPath;
- for (int i = 0; i < size; i++) {
- container = (IContainer) containers.get(i);
- containerPath = container.getFullPath();
- matching = fullPath.matchingFirstSegments(containerPath);
- if (matching > 0 && matching == containerPath.segmentCount()) {
- result = fullPath.removeFirstSegments(matching);
- result = result.makeRelative();
- return result;
- }
- }
- return fullPath;
- }
-
- /**
- * Return true if the <code>uri</code> has its container segments visible from the input containers for the <code>project</code>.
- *
- * @param project
- * @param uri
- * @return <code>true</code> if the uri is visible from the input containers.
- *
- * @since 1.0.0
- */
- public static boolean hasContainerStructure(IProject project, URI uri) {
- if (project != null && uri != null) {
- IPath path = new Path(uri.toString());
- List containers = getProjectURIConverterContainers(project);
- int segmentCount = path.segmentCount();
- IPath containerPath = segmentCount > 1 ? path.removeLastSegments(1) : null;
- IContainer container = null;
- for (int i = 0; i < containers.size(); i++) {
- container = (IContainer) containers.get(i);
- if (!container.isAccessible())
- continue;
- if (segmentCount == 1) {
- if (container == project)
- return true;
- } else if (containerPath != null) {
- IFolder folder = container.getFolder(containerPath);
- if (folder != null && folder.isAccessible())
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Get the resource for the uri. The URI MUST be either a "<b>platform:/resource/</b>project-name/...." type URI or it
- * must be of type "project-name/...". This method will only return resources that are workbench project resources.
- * Any other type of URI will cause <code>null</code> to be returned. It will be loaded if not already loaded. If it is not to
- * be loaded if not loaded use {@link #getResource(URI, boolean)} instead.
- *
- * @param uri must be either a "<b>platform:/resource/</b>project-name/..." form or it must be "project-name/...". Any other form will be invalid.
- * @return resource if uri is for a valid workbench project resource or <code>null</code> if project not found or not a valid project resource.
- *
- * @throws WrappedException if valid project format URI but file not found or some other error on load.
- * @since 1.0.0
- */
- public static Resource getResource(URI uri) {
- return getResource(uri, true);
- }
-
- /**
- * Return the Resource for the passed IFile without forcing a load.
- *
- * @param aFile
- * @return
- *
- * @since 1.0.0
- */
- public static Resource getResource(IFile aFile) {
- return getResource(aFile, false);
- }
-
- /**
- * Return the Resource for the passed IFile, forcing a load if <code>loadOnDemand</code> says so.
- *
- * @param aFile
- * @param loadOnDemand
- * <code>true</code> will force a load of resource if not loaded.
- * @return
- *
- * @since 1.0.0
- */
- public static Resource getResource(IFile aFile, boolean loadOnDemand) {
- if (aFile != null)
- return getResource(URI.createPlatformResourceURI(aFile.getFullPath().toString()), loadOnDemand);
- return null;
- }
-
- /**
- * Return the Resource for the passed IFile without a load if not loaded.
- *
- * @param aFile
- * @return
- *
- * @since 1.0.0
- */
- public static Resource load(IFile aFile) {
- return getResource(aFile, true);
- }
-
- /**
- * Get the resource for the uri. The URI MUST be either a "<b>platform:/resource/</b>project-name/...." type URI or it
- * must be of type "project-name/...". This method will only return resources that are workbench project resources.
- * Any other type of URI will cause <code>null</code> to be returned.
- *
- * @param uri must be either a "<b>platform:/resource/</b>project-name/..." form or it must be "project-name/...". Any other form will be invalid.
- * @param loadOnDemand <code>true</code> will cause resource to be loaded if not already loaded.
- * @return resource if uri is for a valid workbench project resource, or <code>null</code> if project not found, or not a valid project resource uri.
- *
- * @throws WrappedException if valid project format URI but file not found or some other error on load if loadOnDemand is true.
- * @since 1.0.0
- */
- public static Resource getResource(URI uri, boolean loadOnDemand) {
- ResourceSet set = getResourceSet(uri);
- if (set != null)
- return set.getResource(uri, loadOnDemand);
- return null;
- }
-
- /**
- * Return a ResourceSet for the passed URI. The URI should be in the format platform:/resource/{project name}/... or {project name}/... for this
- * api to work.
- *
- * @param uri
- * @return the resource set or <code>null</code> if not of correct form or project doesn't have a resource set.
- *
- * @since 1.0.0
- */
- public static ResourceSet getResourceSet(URI uri) {
- IProject project = getProject(uri);
- if (project != null && project.isAccessible())
- return getResourceSet(project);
- else
- return null;
- }
-
- /*
- * Get the project for the uri if the uri is a valid workbench project format uri. null otherwise.
- */
- private static IProject getProject(URI uri) {
- String projectName;
- if (isPlatformResourceURI(uri))
- projectName = uri.segment(1);
- else if (uri.scheme() == null) {
- projectName = new Path(uri.path()).segment(0); //assume project name is first in the URI
- } else
- return null;
- IProject project = getWorkspace().getRoot().getProject(URI.decode(projectName));
- if (project != null && project.isAccessible())
- return project;
- else
- return null;
- }
-
- /**
- * Return the ResourceSet for the passed IProject.
- *
- * @param project
- * @return resource set
- */
- public static ResourceSet getResourceSet(IProject project) {
- EMFWorkbenchContextBase nat = createEMFContext(project, null);
- if (nat != null)
- return nat.getResourceSet();
- return null;
- }
-
- /**
- * Get the workspace. (just use {@link ResourcesPlugin#getWorkspace()}).
- *
- * @return
- *
- * @since 1.0.0
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Get the project associated with the resource set.
- *
- * @param set
- * @return project or <code>null</code> if resource set not associated with a project.
- *
- * @since 1.0.0
- */
- public static IProject getProject(ResourceSet set) {
- if (set != null) {
- if (set instanceof ProjectResourceSet) {
- ProjectResourceSet pset = (ProjectResourceSet) set;
- return pset.getProject();
- }
- }
- return null;
- }
-
- protected static boolean isRegisteredURIMapping(String href) {
- if (href != null) {
- String file = href;
- int index = href.indexOf('#');
- if (index > -1)
- file = href.substring(0, index);
- return URIConverter.URI_MAP.get(file) != null;
- }
- return false;
- }
-
- /**
- * Remove all of the resources from the resource set and then unload them. Unload forces all of the objects to become proxies so next resolve will
- * reload the resource.
- *
- * @param resources
- * @param aSet
- *
- * @since 1.0.0
- */
- public static void removeAndUnloadAll(List resources, ResourceSet aSet) {
- if (aSet == null || resources == null || resources.isEmpty())
- return;
- aSet.getResources().removeAll(resources);
- Resource res;
- for (int i = 0; i < resources.size(); i++) {
- res = (Resource) resources.get(i);
- res.unload();
- }
- }
-
- /**
- * Turn object into a proxy.
- *
- * @param anObject
- * @return <code>true</code> if object was able to become a proxy.
- *
- * @since 1.0.0
- */
- public static boolean becomeProxy(EObject anObject) {
- if (anObject != null) {
- Resource res = anObject.eResource();
- if (res != null) {
- URI uri = res.getURI();
- ((InternalEObject) anObject).eSetProxyURI(uri.appendFragment(res.getURIFragment(anObject)));
- //anObject.eAdapters().clear();
- return true;
- }
- }
- return false;
- }
-
- /**
- * Return true if the WrappedException is actually a Resource Not Found.
- *
- * @param wrappedEx
- * @return <code>true</code> is exception wrappers a resource not found.
- * @since 1.0.0
- */
- public static boolean isResourceNotFound(WrappedException wrappedEx) {
- Exception excep = wrappedEx.exception();
- while (excep instanceof WrappedException) {
- excep = ((WrappedException) excep).exception();
- }
- return primIsResourceNotFound(excep);
- }
-
- private static boolean primIsResourceNotFound(Throwable excep) {
- if (excep instanceof CoreException) {
- IStatus status = ((CoreException) excep).getStatus();
- return status.getCode() == IResourceStatus.RESOURCE_NOT_FOUND && ResourcesPlugin.PI_RESOURCES.equals(status.getPlugin());
- }
- return false;
- }
-
- /**
- * Return true if the WrappedException is actually a Resource Not Found.
- *
- * @param wrappedEx
- * @return <code>true</code> is exception wrappers a resource not found.
- * @since 1.0.0
- */
- public static boolean isResourceNotFound(Resource.IOWrappedException wrappedEx) {
- return primIsResourceNotFound(wrappedEx.getCause());
- }
-
- /**
- * Return a URI represenation of the platformURI without the leading "platform:/resource/" if present.
- *
- * @param platformURI
- * @return uri
- * @since 1.0.0
- */
- public static URI getNonPlatformURI(URI platformURI) {
- if (isPlatformResourceURI(platformURI)) {
- String uriString = primGetNonPlatformURIString(platformURI);
- return URI.createURI(uriString);
- }
- return platformURI;
- }
-
- /**
- * Return a String represenation of the platformURI without the leading "platform:/resource/" if present.
- *
- * @param platformURI
- * @return
- * @since 1.0.0
- */
- public static String getNonPlatformURIString(URI platformURI) {
- if (isPlatformResourceURI(platformURI)) { return primGetNonPlatformURIString(platformURI); }
- return platformURI.toString();
- }
-
- /*
- * Remove "platform:/resource/" from the front of the platformURI and return the remaining String.
- */
- private static String primGetNonPlatformURIString(URI platformURI) {
- String uriString = platformURI.toString();
- //"platform:/resource/" is 19 characters.
- return uriString.substring(19, uriString.length());
- }
-
- /**
- * Does the passed URI have the form platform:/plugin/... ?
- *
- * @param uri
- * @return <code>true</code> if uri is platform plugin protocol.
- *
- * @since 1.0.0
- */
- public static boolean isPlatformPluginResourceURI(URI uri) {
- if (uri == null) return false;
- return JEMUtilPlugin.PLATFORM_PROTOCOL.equals(uri.scheme()) && JEMUtilPlugin.PLATFORM_PLUGIN.equals(uri.segment(0));
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java
deleted file mode 100644
index e556851..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchURIConverter.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-/**
- * Implementers of this interface are WorkbenchURI converters. Workbench URI converters handle references to files in the project's containers.
- * This converter is only necessary to resolve old ambiguous workbench URIs.
- * @since 1.0.0
- */
-public interface WorkbenchURIConverter extends URIConverter {
-
- /**
- * Add input container to to the converter.
- *
- * @param aContainer
- *
- * @since 1.0.0
- */
- void addInputContainer(IContainer aContainer);
-
- /**
- * Add list of containers to the converter.
- *
- * @param containers
- * list of <code>IContainer</code>
- *
- * @since 1.0.0
- */
- void addInputContainers(List containers);
-
- /**
- * Get the file relative to a container.
- *
- * @param uri
- * @return file relative to a container or <code>null</code> if not.
- *
- * @since 1.0.0
- */
- IFile getFile(String uri);
-
- /**
- * Get first input container
- *
- * @return first input container or <code>null</code> if none set.
- *
- * @since 1.0.0
- */
- IContainer getInputContainer();
-
- /**
- * Get all input containers.
- *
- * @return all input containers.
- *
- * @since 1.0.0
- */
- List getInputContainers();
-
- /**
- * Get the output container if set.
- *
- * @return output container or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- IContainer getOutputContainer();
-
- /**
- * Set the output container.
- *
- * @param container
- *
- * @since 1.0.0
- */
- void setOutputContainer(IContainer container);
-
- /**
- * Return an IFile for
- *
- * @aPath. If we have a parent and we do not contain the first segment of the aPath, forward to the parent to retrieve the file.
- * @param aPath
- * @return
- *
- * @since 1.0.0
- */
- IFile getOutputFile(IPath aPath);
-
- /**
- * Get output file with mapping applied.
- *
- * @param uri
- * @return
- *
- * @since 1.0.0
- */
- IFile getOutputFileWithMappingApplied(String uri);
-
- /**
- * Remove input container from list.
- *
- * @param aContainer
- * @return <code>true</code> if removed.
- *
- * @since 1.0.0
- */
- boolean removeInputContainer(IContainer aContainer);
-
- /**
- * Return true if we can retrieve the resource used to open an input stream on.
- *
- * @param aFileName
- * @return <code>true</code> if filename is valid for file stream access.
- * @since 1.0.0
- *
- */
- boolean canGetUnderlyingResource(String aFileName);
-
- /**
- * Is force save relative flag turned on.
- *
- * @return <code>true</code> if force save relative is turned on.
- *
- * @since 1.0.0
- */
- boolean isForceSaveRelative();
-
- /**
- * Set to true if you do not want any path manipulation when creating the output stream..
- *
- * @param forceSaveRelative
- * <code>true</code> to force saves as relative.
- */
- void setForceSaveRelative(boolean forceSaveRelative);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java
deleted file mode 100644
index 6365551..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchURIConverterImpl.java,v $$
- * $$Revision: 1.6 $$ $$Date: 2006/05/17 20:13:45 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A default implementation of the WorkbenchURIConverter interface.
- *
- * @since 1.0.0
- */
-public class WorkbenchURIConverterImpl extends URIConverterImpl implements WorkbenchURIConverter {
-
- private final static IWorkspaceRoot WORKSPACE_ROOT = URIConverterImpl.workspaceRoot;
- private final static String WORKSPACE_ROOT_LOCATION = WORKSPACE_ROOT.getLocation().toString();
-
- private static final String FILE_PROTOCOL = "file"; //$NON-NLS-1$
-
- private static final IPath INVALID_PATH = new Path("!!!!~!!!!"); //$NON-NLS-1$
-
- private static final IFile INVALID_FILE = WORKSPACE_ROOT.getFile(INVALID_PATH.append(INVALID_PATH));
-
- //Used to avoid trying to fixup the URI when getting the
- //OutputStream
- protected boolean forceSaveRelative = false;
-
- protected List inputContainers;
-
- protected IContainer outputContainer;
-
- protected ResourceSetWorkbenchSynchronizer resourceSetSynchronizer;
-
- /*
- * KLUDGE: We need to know the meta data area. This is so that any uri that starts with the metadata directory
- * is considered a file uri and NOT a workspace uri. The metadata is where plugin's store their working data.
- * It is not part of the workspace root.
- *
- * There is no request for simply the metadata area. The log file is in the metadata directory. So we will
- * get the log file location and just remove the log file name. That should leave us with the metadata directory
- * only. If Eclipse ever decides to move it from here, this will no longer work. But it hasn't moved in three
- * versions.
- *
- * @since 1.1.0
- */
- static protected final String METADATA_LOCATION = Platform.getLogFileLocation().removeLastSegments(1).toString();
-
- /**
- * Default converter constructor, no containers.
- *
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl() {
- super();
- }
-
- /**
- * Construct with an input container.
- *
- * @param anInputContainer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer) {
- this(anInputContainer, (ResourceSetWorkbenchSynchronizer) null);
- }
-
- /**
- * Construct with an input container and a synchronzier.
- *
- * @param aContainer
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer aContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- this(aContainer, null, aSynchronizer);
- }
-
- /**
- * Construct with an input container and an output container.
- *
- * @param anInputContainer
- * @param anOutputContainer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer) {
- this(anInputContainer, anOutputContainer, null);
- }
-
- /**
- * Construct with an input container, output container, and a synchronizer.
- *
- * @param anInputContainer
- * @param anOutputContainer
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- addInputContainer(anInputContainer);
- setOutputContainer(anOutputContainer);
- resourceSetSynchronizer = aSynchronizer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#addInputContainer(org.eclipse.core.resources.IContainer)
- */
- public void addInputContainer(IContainer aContainer) {
- if (aContainer != null && !getInputContainers().contains(aContainer))
- getInputContainers().add(aContainer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#addInputContainers(java.util.List)
- */
- public void addInputContainers(List containers) {
- for (int i = 0; i < containers.size(); i++) {
- addInputContainer((IContainer) containers.get(i));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#removeInputContainer(org.eclipse.core.resources.IContainer)
- */
- public boolean removeInputContainer(IContainer aContainer) {
- return getInputContainers().remove(aContainer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getInputContainers()
- */
- public List getInputContainers() {
- if (inputContainers == null)
- inputContainers = new ArrayList();
- return inputContainers;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getInputContainer()
- */
- public IContainer getInputContainer() {
- if (!getInputContainers().isEmpty())
- return (IContainer) getInputContainers().get(0);
- else
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputContainer()
- */
- public IContainer getOutputContainer() {
- if (outputContainer == null)
- outputContainer = getInputContainer();
- return outputContainer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#setOutputContainer(org.eclipse.core.resources.IContainer)
- */
- public void setOutputContainer(IContainer newOutputContainer) {
- outputContainer = newOutputContainer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputFile(org.eclipse.core.runtime.IPath)
- */
- public IFile getOutputFile(IPath aPath) {
- IFile file = null;
- if (getOutputContainer() != null) {
- if (forceSaveRelative)
- return primGetOutputFile(aPath);
- file = getOutputFileForPathWithContainerSegments(aPath);
- if (file != null)
- return file;
- else
- return primGetOutputFile(aPath);
- }
- return file;
- }
-
- protected IFile primGetOutputFile(IPath aPath) {
- return primGetFile(getOutputContainer(), aPath);
- }
-
- protected IFile getOutputFileForPathWithContainerSegments(IPath aPath) {
- IContainer out = getOutputContainer();
- return getFileForPathWithContainerSegments(aPath, out, false);
- }
-
- protected IFile getFileForPathWithContainerSegments(IPath aPath, IContainer container, boolean testExists) {
- IPath containerPath = null;
- IFile file = null;
- if (testExists) {
- containerPath = container.getProjectRelativePath();
- if (!containerPath.isEmpty()) {
- file = getFileForMatchingPath(aPath, containerPath, container);
- if (file != null && file.exists())
- return file;
- }
- }
- containerPath = container.getFullPath();
- file = getFileForMatchingPath(aPath, containerPath, container);
- return file;
- }
-
- protected IFile getFileForMatchingPath(IPath containerPath, IPath sourcePath, IContainer container) {
- int matches = 0;
- matches = containerPath.matchingFirstSegments(sourcePath);
- if (matches > 0 && matches == sourcePath.segmentCount()) {
- IPath loadPath = containerPath.removeFirstSegments(matches);
- return primGetFile(container, loadPath);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getFile(java.lang.String)
- */
- public IFile getFile(String uri) {
- return getFile(new Path(uri));
- }
-
- /**
- * Get the file from the path.
- *
- * @param path
- * @return
- * @see WorkbenchURIConverter#getFile(String)
- * @since 1.0.0
- */
- public IFile getFile(IPath path) {
- IFile file = null;
- if (getInputContainer() != null) {
- path = path.makeRelative();
- java.util.Iterator it = getInputContainers().iterator();
- while (it.hasNext()) {
- IContainer con = (IContainer) it.next();
- file = getInputFile(con, path);
- if (file != null && file.exists())
- return file;
- }
- }
- if (file == null)
- return INVALID_FILE;
- return file;
- }
-
- /**
- * Get output file from string path.
- *
- * @param uri
- * @return
- *
- * @see WorkbenchURIConverter#getOutputFile(IPath)
- * @since 1.0.0
- */
- public IFile getOutputFile(String uri) {
- return getOutputFile(new Path(uri));
- }
-
- /**
- * Get the input file from the container and path.
- *
- * @param con
- * @param path
- * @return
- *
- * @since 1.0.0
- */
- public IFile getInputFile(IContainer con, IPath path) {
- IFile file = null;
- if (WORKSPACE_ROOT.equals(con) && path.segmentCount() < 2)
- path = INVALID_PATH.append(path);
- file = primGetFile(con, path);
- if (file == null || !file.exists())
- file = getFileForPathWithContainerSegments(path, con, true);
- return file;
- }
-
- protected IFile primGetFile(IContainer container, IPath path) {
- try {
- return container.getFile(path);
- } catch (IllegalArgumentException ex) {
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#canGetUnderlyingResource(java.lang.String)
- */
- public boolean canGetUnderlyingResource(String aFileName) {
- IFile file = getFile(aFileName);
- return file != null && file.exists();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#isForceSaveRelative()
- */
- public boolean isForceSaveRelative() {
- return forceSaveRelative;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#setForceSaveRelative(boolean)
- */
- public void setForceSaveRelative(boolean forceSaveRelative) {
- this.forceSaveRelative = forceSaveRelative;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.URIConverter#normalize(org.eclipse.emf.common.util.URI)
- */public URI normalize(URI uri) {
- URI result = uri;
- String fragment = null;
- if (uri.hasFragment()) {
- fragment = uri.fragment();
- result = uri.trimFragment();
- }
- result = getInternalURIMap().getURI(result);
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(result))
- return appendFragment(result, fragment);
- if (WorkbenchResourceHelperBase.isPlatformPluginResourceURI(result)) {
- URI normalized = normalizePluginURI(result, fragment);
- return (normalized != null) ? normalized : uri;
- }
- String protocol = result.scheme();
- URI fileSearchURI = null;
- if (protocol == null) {
- fileSearchURI = normalizeEmptyProtocol(result, fragment);
- if (fileSearchURI != null)
- return fileSearchURI;
- } else if (FILE_PROTOCOL.equals(protocol)) {
- fileSearchURI = normalizeFileProtocol(result, fragment);
- if (fileSearchURI != null)
- return fileSearchURI;
- } else if (JEMUtilPlugin.WORKSPACE_PROTOCOL.equals(protocol))
- return normalizeWorkspaceProtocol(result, fragment);
- return super.normalize(uri);
- }
-
- /*
- * Resolves a plugin format into the actual.
- */
- protected URI normalizePluginURI(URI uri, String fragment) {
- if (uri.segmentCount() < 2)
- return uri; // Invalid, just let it go on.
- // See if already normalized.
- int u_scoreNdx = uri.segment(1).lastIndexOf('_');
- if (u_scoreNdx != -1) {
- // Not normalized. Remove the version to make it normalized.
- String[] segments = uri.segments();
- segments[1] = segments[1].substring(0, u_scoreNdx);
- return URI.createHierarchicalURI(uri.scheme(), uri.authority(), uri.device(), segments, uri.query(), fragment);
- } else
- return uri;
- }
-
- protected URI normalizeWorkspaceProtocol(URI aWorkspaceURI, String fragment) {
- URI result;
- String uriString = aWorkspaceURI.toString();
- uriString = uriString.substring(JEMUtilPlugin.WORKSPACE_PROTOCOL.length() + 1);
- result = URI.createPlatformResourceURI(uriString);
- if (fragment != null)
- result = appendFragment(aWorkspaceURI, fragment);
- return result;
- }
-
- protected URI normalizeEmptyProtocol(URI aFileUri, String fragment) {
- //Make the relative path absolute and return a platform URI.
- IPath path = new Path(aFileUri.toString());
- return normalizeToWorkspaceURI(path, fragment);
- }
-
- private URI normalizeToWorkspaceURI(IPath path, String fragment) {
- URI result = null;
- IFile file = getFile(path);
- if (file == null || !file.exists())
- file = getOutputFile(path);
- if (file != null) {
- result = URI.createPlatformResourceURI(file.getFullPath().toString());
- result = appendFragment(result, fragment);
- }
- return result;
- }
-
- protected URI normalizeFileProtocol(URI aFileUri, String fragment) {
- URI result = null;
- //Make the relative path absolute and return a platform URI.
- String devicePath = aFileUri.devicePath();
- //Test for workspace location.
- if (!devicePath.startsWith(METADATA_LOCATION) &&
- devicePath.startsWith(WORKSPACE_ROOT_LOCATION) && devicePath.length() > WORKSPACE_ROOT_LOCATION.length()) {
- //test for workspace location
- result = normalizeToWorkspaceURI(new Path(devicePath.substring(WORKSPACE_ROOT_LOCATION.length())), fragment);
- } else if (aFileUri.isRelative()) {
- result = normalizeToWorkspaceURI(new Path(aFileUri.toString()), fragment);
- } else {
- result = aFileUri;
- }
- return result;
- }
-
- protected URI appendFragment(URI result, String fragment) {
- if (fragment != null)
- return result.appendFragment(fragment);
- else
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputFileWithMappingApplied(java.lang.String)
- */
- public IFile getOutputFileWithMappingApplied(String uri) {
- URI converted = getInternalURIMap().getURI(URI.createURI(uri));
- return getOutputFile(new Path(converted.toString()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#createPlatformResourceOutputStream(java.lang.String)
- */
- public OutputStream createPlatformResourceOutputStream(String platformResourcePath) throws IOException {
- IFile file = WORKSPACE_ROOT.getFile(new Path(platformResourcePath));
- ProjectUtilities.ensureContainerNotReadOnly(file);
- return new WorkbenchByteArrayOutputStream(file, resourceSetSynchronizer);
- }
-
- protected URI getContainerRelativeURI(IFile aFile) {
- IPath path = WorkbenchResourceHelperBase.getPathFromContainers(inputContainers, aFile.getFullPath());
- if (path != null)
- return URI.createURI(path.toString());
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#createPlatformResourceInputStream(java.lang.String)
- */
- public InputStream createPlatformResourceInputStream(String platformResourcePath) throws IOException {
- IFile file = WORKSPACE_ROOT.getFile(new Path(platformResourcePath));
- try {
- if (!file.isSynchronized(IResource.DEPTH_ONE)) {
- try {
- File iofile = file.getFullPath().toFile();
- if (iofile.exists() || file.exists())
- file.refreshLocal(IResource.DEPTH_ONE, null);
- } catch (CoreException ce) {
- if (ce.getStatus().getCode() != IResourceStatus.WORKSPACE_LOCKED)
- throw ce;
- }
- }
- // CHANGED from <no-args> to <true> [94015]
- return file.getContents(true);
- } catch (CoreException exception) {
- throw new Resource.IOWrappedException(exception);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java
deleted file mode 100644
index f7f288a..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFNature.java,v $$
- * $$Revision: 1.4 $$ $$Date: 2005/02/15 23:04:14 $$
- */
-package org.eclipse.jem.util.emf.workbench.nature;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMLParserPool;
-import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
-
-import org.eclipse.jem.internal.util.emf.workbench.nature.EMFNatureRegistry;
-import org.eclipse.jem.util.emf.workbench.*;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * The base EMFNature.
- * <p>
- * This is expected to be subclassed by clients, but there are default subclasses available.
- * </p>
- *
- * @since 1.0.0
- */
-public abstract class EMFNature implements IProjectNature, IEMFContextContributor {
-
- protected IProject project;
-
- protected EMFWorkbenchContextBase emfContext;
-
- protected boolean hasConfigured = false;
-
- public static XMLParserPool SHARED_PARSER_POOL = new XMLParserPoolImpl();
-
- public EMFNature() {
- super();
- }
-
- /**
- * Add the nature id to the project.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- protected static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- ProjectUtilities.addNatureToProject(proj, natureId);
- }
-
- /**
- * Configures the project with this nature. This is called by <code>IProject.addNature</code> and should not be called directly by clients. The
- * nature extension id is added to the list of natures on the project by <code>IProject.addNature</code>, and need not be added here.
- *
- * <p>
- * All subtypes must call super. The better way for subtypes is to override primConfigure instead.
- * </p>
- *
- * @throws CoreException
- * @since 1.0.0
- */
- public void configure() throws org.eclipse.core.runtime.CoreException {
- if (!hasConfigured) {
- hasConfigured = true;
- primConfigure();
- }
- }
-
- /**
- * Called from configure the first time configure is called on the nature. Default is do nothing. Subclasses should override and add in their own
- * configuration.
- *
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- protected void primConfigure() throws org.eclipse.core.runtime.CoreException {
-
- }
-
- /**
- * Create an EMF context for the project.
- *
- * @throws CoreException
- *
- * @since 1.0.0
- */
- protected void createEmfContext() throws CoreException {
- WorkbenchResourceHelperBase.createEMFContext(getProject(), this);
- }
-
- /**
- * Create a folder relative to the project based on aProjectRelativePathString.
- *
- * @param aProjectRelativePathString
- * @return
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public IFolder createFolder(String aProjectRelativePathString) throws CoreException {
- if (aProjectRelativePathString != null && aProjectRelativePathString.length() > 0)
- return createFolder(new Path(aProjectRelativePathString));
- return null;
- }
-
- /**
- * Create a folder relative to the project based on aProjectRelativePathString.
- *
- * @param aProjectRelativePath
- * @return
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public IFolder createFolder(IPath aProjectRelativePath) throws CoreException {
- if (aProjectRelativePath != null && !aProjectRelativePath.isEmpty()) {
- IFolder folder = getWorkspace().getRoot().getFolder(getProjectPath().append(aProjectRelativePath));
- if (!folder.exists()) {
- ProjectUtilities.ensureContainerNotReadOnly(folder);
- folder.create(true, true, null);
- }
- return folder;
- }
- return null;
- }
-
- /**
- * Removes this nature from the project, performing any required deconfiguration. This is called by <code>IProject.removeNature</code> and
- * should not be called directly by clients. The nature id is removed from the list of natures on the project by
- * <code>IProject.removeNature</code>, and need not be removed here.
- *
- * @throws CoreException
- * @since 1.0.0
- */
- public void deconfigure() throws org.eclipse.core.runtime.CoreException {
- emfContext = null;
- }
-
- /**
- * Return true if the IFile with the given name exists in this project.
- *
- * @param aFileName
- * filename can be relative to one of the input file paths for the WorkbenchURIConverter.
- * @return <code>true</code> if filename exists in this project
- *
- * @since 1.0.0
- */
- public boolean fileExists(String aFileName) {
- if (aFileName == null)
- return false;
-
- IPath path = new Path(aFileName);
- if (path.isAbsolute())
- return ResourcesPlugin.getWorkspace().getRoot().getFile(path).exists();
- else
- return getWorkbenchURIConverter().canGetUnderlyingResource(aFileName);
- }
-
- /**
- * Get the resource set for the project
- *
- * @return
- *
- * @since 1.0.0
- */
- public ResourceSet getResourceSet() {
- return getEmfContextBase().getResourceSet();
- }
-
- /**
- * Returns the EMF root folder for the project. Defaults to the project. Subclasses can override.
- *
- * @return EMF root folder for the project.
- *
- * @since 1.0.0
- */
- public IContainer getEMFRoot() {
- return getProject();
- }
-
- /**
- * Used for optimizations; answers whether a mof context for this nature has exists yet
- *
- * @deprecated use hasResourceSet();
- * @since 1.0.0
- */
- public boolean hasContext() {
- return hasResourceSet();
- }
-
- /**
- * Is there a resource set yet for the project.
- *
- * @return <code>true</code> if there is a resource set for the project.
- *
- * @since 1.0.0
- */
- public boolean hasResourceSet() {
- return emfContext != null && emfContext.hasResourceSet();
- }
-
- /**
- * Lazy initializer; for migration of existing workspaces where configure will never get called.
- *
- * @return context base for the project.
- *
- * @since 1.0.0
- */
- protected EMFWorkbenchContextBase getEmfContextBase() {
- if (emfContext == null) {
- try {
- createEmfContext();
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
- }
- return emfContext;
- }
-
- /**
- * Get the IFile with the given name if it is in this project.
- *
- * @param aFileName
- * filename can be relative to one of the input file paths for the WorkbenchURIConverter.
- * @return file it it is in this project, or <code>null</code> if it doesn't.
- *
- * @since 1.0.0
- */
- public IFile getFile(String aFileName) {
- return getWorkbenchURIConverter().getFile(aFileName);
- }
-
- /**
- * Return the nature's ID.
- *
- * @return nature id
- *
- * @since 1.0.0
- */
- public abstract String getNatureID();
-
- /**
- * Return the ID of the plugin that this nature is contained within.
- *
- * @return
- *
- * @since 1.0.0
- */
- protected abstract String getPluginID();
-
- /**
- * Returns the project to which this project nature applies.
- *
- * @return the project handle
- * @since 1.0.0
- */
- public org.eclipse.core.resources.IProject getProject() {
- return project;
- }
-
- /**
- * Return the full path of the project.
- *
- * @return full project path (relative to workspace)
- * @since 1.0.0
- */
- public IPath getProjectPath() {
- return getProject().getFullPath();
- }
-
- /**
- * Get the server property of the project from the supplied key
- *
- * @param key
- * java.lang.String
- * @deprecated we cannont use persistent properties because they are not stored in the repository
- * @since 1.0.0
- */
- protected String getProjectServerValue(String key) {
- if (key == null)
- return null;
- try {
- QualifiedName wholeName = qualifiedKey(key);
- return getProject().getPersistentProperty(wholeName);
- } catch (CoreException exception) {
- //If we can't find it assume it is null
- exception.printStackTrace();
- return null;
- }
- }
-
- /**
- * Get WorkbenchURIConverter for this project.
- * <p>
- * This method assumes the URIConverter on the ResourceSet is the one that was created for the ResourceSet on behalf of this nature runtime.
- * </p>
- *
- * @return
- *
- * @since 1.0.0
- */
- protected WorkbenchURIConverter getWorkbenchURIConverter() {
- return (WorkbenchURIConverter) getResourceSet().getURIConverter();
- }
-
- public IWorkspace getWorkspace() {
- return getProject().getWorkspace();
- }
-
- /**
- * @deprecated use getResource(URI)
- */
- public Resource getXmiResource(String uri) {
- return getResource(URI.createURI(uri));
- }
-
- /**
- * Get the resource for this uri. It will use the resource set of the project to find it. It will load if not already loaded.
- *
- * @param uri
- * @return resource or <code>null</code> if resource is not found.
- *
- * @since 1.0.0
- */
- public Resource getResource(URI uri) {
- try {
- return getResourceSet().getResource(uri, true);
- } catch (WrappedException ex) {
- if (!WorkbenchResourceHelperBase.isResourceNotFound(ex))
- throw ex;
- }
- return null;
- }
-
- /**
- * @deprecated use getResourceSet()
- */
- public ResourceSet getXmiResourceSet() {
- return getResourceSet();
- }
-
- /**
- * Make sure that all dependent components are initialized before creating the ResourceSet.
- */
- protected void initializeDependentComponents() {
- //com.ibm.etools.java.init.JavaInit.init();
- }
-
- /**
- * @deprecated use createResource(URI)
- */
- public Resource makeXmiResource(String uri) {
- return createResource(URI.createURI(uri));
- }
-
- /**
- * @deprecated use createResource(URI)
- */
- public Resource makeXmiResource(String uri, EList anExtent) {
- Resource res = makeXmiResource(uri);
- if (res != null)
- res.getContents().addAll(anExtent);
- return res;
- }
-
- /**
- * Create the resource for this uri. It will use the resource set of the project to create it.
- *
- * @param uri
- * @return resource
- *
- * @since 1.0.0
- */
- public Resource createResource(URI uri) {
- return getResourceSet().createResource(uri);
- }
-
- /*
- * Return the QualifedValue for key for storage in the repository. The key is qualifed with the package name to avoid collision. @return
- * QualifedName @param key java.lang.String
- */
- private QualifiedName qualifiedKey(String key) {
- return new QualifiedName(getPluginID(), key);
- }
-
- /**
- * Register the given nature id as an EMFNature.
- *
- * @param natureID
- *
- * @since 1.0.0
- */
- public static void registerNatureID(String natureID) {
- EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.add(natureID);
- }
-
- /**
- * Sets the project to which this nature applies. Used when instantiating this project nature runtime. This is called by
- * <code>IProject.addNature</code> and should not be called directly by clients.
- *
- * @param project
- * the project to which this nature applies
- *
- * @since 1.0.0
- */
- public void setProject(org.eclipse.core.resources.IProject newProject) {
- project = newProject;
- }
-
- /**
- * Set the server property of the project from the supplied value
- *
- * @param key
- * java.lang.String
- * @param value
- * String
- * @deprecated we cannont use persistent properties because they are not stored in the repository
- */
- protected void setProjectServerValue(String key, String value) {
- if (key != null) {
- try {
- QualifiedName wholeName = qualifiedKey(key);
- getProject().setPersistentProperty(wholeName, value);
- } catch (CoreException exception) {
- //If we can't find it assume it is null
- exception.printStackTrace();
- return;
- }
- }
- }
-
- /**
- * Shutdown the EMF nature
- *
- *
- * @since 1.0.0
- */
- public void shutdown() {
- if (getResourceSet() != null)
- ((ProjectResourceSet) getResourceSet()).release();
- }
-
- /**
- * Return a list of EMFNatures based on the natures that have been configured for this project.
- *
- * @return List of EMFNatures
- * @param project
- * @return list of natures configured for the project.
- * @since 1.0.0
- */
- public static List getRegisteredRuntimes(IProject project) {
- List result = null;
- EMFNature nature = null;
- if (project != null && project.isAccessible()) {
- String natureID;
- Iterator it = EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.iterator();
- while (it.hasNext()) {
- natureID = (String) it.next();
- try {
- nature = (EMFNature) project.getNature(natureID);
- } catch (CoreException e) {
- }
- if (nature != null) {
- if (result == null)
- result = new ArrayList(2);
- result.add(nature);
- }
- }
- }
- return result == null ? Collections.EMPTY_LIST : result;
- }
-
- /**
- * Return a list of nature ids based on the natures that have been configured for this project.
- *
- * @return list of configured nature ids.
- * @param project
- */
- public static List getRegisteredRuntimeIDs(IProject project) {
- List result = null;
- String natureID = null;
- if (project != null && project.isAccessible()) {
- Iterator it = EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.iterator();
- while (it.hasNext()) {
- natureID = (String) it.next();
- try {
- if (project.hasNature(natureID)) {
- if (result == null)
- result = new ArrayList(2);
- result.add(natureID);
- }
- } catch (CoreException e) {
- }
- }
- }
- return result == null ? Collections.EMPTY_LIST : result;
- }
-
- /**
- * Return if the project has the given nature.
- *
- * @param project
- * @param natureId
- * @return <code>true</code> if project has given nature
- *
- * @since 1.0.0
- */
- public static boolean hasRuntime(IProject project, String natureId) {
- if (project == null || !project.isAccessible())
- return false;
- try {
- return project.hasNature(natureId);
- } catch (CoreException e) {
- return false;
- }
- }
-
- /**
- * Return if the project has any one of the possible given nature ids.
- *
- * @param project
- * @param possibleNatureIds
- * @return <code>true</code> if at least one of the possible natures id is configured for the project.
- *
- * @since 1.0.0
- */
- public static boolean hasRuntime(IProject project, String[] possibleNatureIds) {
- if (project != null) {
- for (int i = 0; i < possibleNatureIds.length; i++) {
- if (hasRuntime(project, possibleNatureIds[i]))
- return true;
- }
- }
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
deleted file mode 100644
index b2c1473..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.*;
-
-
-/**
- * Base log renderer that logs to the workbench.
- *
- * @since 1.1.0
- */
-public abstract class AbstractWorkBenchRenderer implements ILogRenderer2 {
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
-
- private boolean fSettingTrace = false;
-
- protected Bundle fMyBundle = null;
-
- protected Logger fMyLogger = null;
-
- protected ILog fWorkBenchLogger = null;
-
- /**
- * Constructer taking a logger.
- *
- * @param logger
- *
- * @since 1.1.0
- */
- public AbstractWorkBenchRenderer(Logger logger) {
- super();
- fMyLogger = logger;
- fTraceMode = fMyLogger.getTraceMode();
-
- String pluginID = fMyLogger.getPluginID();
- fMyBundle = Platform.getBundle(pluginID);
- if (fMyBundle == null)
- throw new RuntimeException("Invalid Plugin ID"); //$NON-NLS-1$
-
- fWorkBenchLogger = Platform.getLog(fMyBundle);
- setTraceMode(fMyLogger.getTraceMode() || isDebugging(fMyBundle));
- fMyLogger.setRenderer(this);
- }
-
- /*
- * This used to come from the Plugin instance. But in new OSGi, there is not necessarily a Plugin instance. So use the same logic they use.
- */
- private boolean isDebugging(Bundle bundle) {
- String symbolicName = bundle.getSymbolicName();
- if (symbolicName != null) {
- String key = symbolicName + "/debug"; //$NON-NLS-1$
- String value = Platform.getDebugOption(key);
- return value == null ? false : value.equalsIgnoreCase("true"); //$NON-NLS-1$
- }
- return false;
- }
-
- /**
- * Is the console log for eclipse turned on to sysout. If true, then we shouldn't log to console anything already logged because Eclipse would of
- * logged it for us. This comes from the -Declipse.consoleLog="true" which is the default when starting eclipse from PDE.
- */
- protected static final boolean consoleLogOn;
- static {
- String consologPropertyName = null;
- try {
- // Accessing an internal field, so using reflection. This way if changes in future we won't crash.
- Class eclipseStarter = Class.forName("org.eclipse.core.runtime.adaptor.EclipseStarter"); //$NON-NLS-1$
- Field consolelog = eclipseStarter.getDeclaredField("PROP_CONSOLE_LOG"); //$NON-NLS-1$
- consologPropertyName = (String) consolelog.get(null);
- } catch (SecurityException e) {
- } catch (IllegalArgumentException e) {
- } catch (ClassNotFoundException e) {
- } catch (NoSuchFieldException e) {
- } catch (IllegalAccessException e) {
- }
- consoleLogOn = consologPropertyName != null && "true".equals(System.getProperty(consologPropertyName)) ; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#setTraceMode(boolean)
- */
- public void setTraceMode(boolean flag) {
- if (fSettingTrace)
- return; // Do not allow cycles
-
- fSettingTrace = true;
- fTraceMode = flag;
- fMyLogger.setTraceMode(flag);
- fSettingTrace = false;
- }
-
- // The following methods are for historical renderers in case this has been subclassed outside
- // of util.
-
- /**
- * Log a string to the trace.
- *
- * @param param
- * @return
- *
- * @since 1.0.0
- */
- public abstract String log(String param);
-
- /**
- * Default one that log a string to the trace given a level. Default simply passes it to log(String) so that we don't break old subclasses.
- * <p>
- * If loggedToWorkbench is true, then it shouldn't be logged to console if consoleLogOn is true because workbench already logged to console.
- *
- * @param msg
- * @param l
- *
- * @since 1.0.0
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- log(msg);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#log(java.lang.String, int)
- */
- public String log(String msg, int type) {
-
- String target = logWorkBench(msg, type);
- if (fTraceMode || target.equals(NOLOG_DESCRIPTION))
- return log(msg);
- else
- return target;
- }
-
- /**
- * Log to workbench, a string of the given level <code>ILogRenderer.LOG_</code>. levels.
- *
- * @param msg
- * @param type
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @see ILogRenderer#LOG_ERROR and all of the other log types.
- * @see ILogRenderer#CONSOLE_DESCRIPTION
- * @since 1.0.0
- */
- public String logWorkBench(String msg, int type) {
-
- try {
- int ErrCode;
- if (fWorkBenchLogger != null) {
- switch (type) {
- case (ILogRenderer.LOG_ERROR):
- ErrCode = IStatus.ERROR;
- break;
- case (ILogRenderer.LOG_WARNING):
- ErrCode = IStatus.WARNING;
- break;
- case (ILogRenderer.LOG_INFO):
- ErrCode = IStatus.INFO;
- break;
- case (ILogRenderer.LOG_TRACE):
- ErrCode = IStatus.OK;
- break;
- default:
- throw new RuntimeException("Invalid Log Type"); //$NON-NLS-1$
- }
- Status status = new Status(ErrCode, fMyBundle.getSymbolicName(), IStatus.OK, msg, null);
- fWorkBenchLogger.log(status);
- return WORKBENCH_DESCRIPTION;
- } else
- return NOLOG_DESCRIPTION;
- } catch (Exception t) {
- return NOLOG_DESCRIPTION;
- }
- }
-
- // Default implentation of the ILogRenderer2 interface.
- protected boolean isLogging(Level level) {
- return fTraceMode || fMyLogger.isLoggingLevel(level);
- }
-
- private static final int[] STATUS_LEVEL;
-
- private static final Level[] STATUS_LEVEL_LOOKUP;
-
- private static final Level[] LEVEL_STATUS;
-
- static {
- // Status levels that correspond to the log levels, from finest to none, same indexes as from STATUS_LEVEL_LOOKUP.
- STATUS_LEVEL_LOOKUP = new Level[] { Level.INFO, Level.WARNING, Level.SEVERE};
- STATUS_LEVEL = new int[] { IStatus.INFO, IStatus.WARNING, IStatus.ERROR};
-
- // Levels that correspond to the IStatus levels.
- int maxID = Math.max(IStatus.OK, Math.max(IStatus.INFO, Math.max(IStatus.WARNING, IStatus.ERROR)));
- LEVEL_STATUS = new Level[maxID + 1];
- LEVEL_STATUS[IStatus.OK] = Level.FINE;
- LEVEL_STATUS[IStatus.INFO] = Level.INFO;
- LEVEL_STATUS[IStatus.WARNING] = Level.WARNING;
- LEVEL_STATUS[IStatus.ERROR] = Level.SEVERE;
- }
-
- /**
- * Return the Java Level for the status code from the given IStatus.
- *
- * @param status
- * @return the Java Level
- *
- * @since 1.0.0
- */
- protected Level getLogLevel(IStatus status) {
- return LEVEL_STATUS[status.getSeverity()];
- }
-
- /**
- * Return the IStatus status code for the given Java Level.
- *
- * @param logLevel
- * @return the IStatus status code.
- *
- * @since 1.0.0
- */
- protected int getStatusSeverity(Level logLevel) {
- for (int i = 0; i < STATUS_LEVEL_LOOKUP.length; i++) {
- if (STATUS_LEVEL_LOOKUP[i] == logLevel)
- return STATUS_LEVEL[i];
- }
- return IStatus.OK; // Default to ok.
- }
-
- /**
- * Log the string to the workbench for the given level
- *
- * @param msg
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.1.0
- */
- protected String logWorkbench(String msg, Level level) {
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, msg, null));
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(msg, level, true);
- } else if (fTraceMode)
- log(msg, level, false);
- return result;
- }
-
- private String getStatusMsg(IStatus s, Level l) {
- if (s.getException() != null)
- return fMyLogger.getGenericMsg(s.toString() + fMyLogger.fLineSeperator + fMyLogger.exceptionToString(s.getException()), l);
- else
- return fMyLogger.getGenericMsg(s.toString(), l);
- }
-
- /**
- * Log the IStatus to the workbench at the given level.
- *
- * @param s
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.0.0
- */
- protected String logWorkbench(IStatus s, Level level) {
- if (level == DEFAULT)
- level = getLogLevel(s);
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(s);
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(getStatusMsg(s, level), level, true);
- } else if (fTraceMode)
- log(getStatusMsg(s, level), level, false);
- return result;
- }
-
- /**
- * Log to the workbench the Throwable at the given level.
- *
- * @param t
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.0.0
- */
- protected String logWorkbench(Throwable t, Level level) {
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, "Exception thrown.", t)); //$NON-NLS-1$
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level, true);
- } else if (fTraceMode)
- log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level, false);
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(boolean b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(byte b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(char, java.util.logging.Level)
- */
- public String log(char c, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(c), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(double, java.util.logging.Level)
- */
- public String log(double d, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(d), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(float, java.util.logging.Level)
- */
- public String log(float f, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(f), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(int, java.util.logging.Level)
- */
- public String log(int i, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(i), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(long, java.util.logging.Level)
- */
- public String log(long l, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(l), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Object, java.util.logging.Level)
- */
- public String log(Object o, Level level) {
- if (o instanceof IStatus)
- return logWorkbench((IStatus) o, level);
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(o), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(short, java.util.logging.Level)
- */
- public String log(short s, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(s), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Throwable, java.util.logging.Level)
- */
- public String log(Throwable t, Level level) {
- if (t instanceof CoreException)
- return logWorkbench(((CoreException) t).getStatus(), level);
- if (level == DEFAULT)
- level = Level.SEVERE;
- if (isLogging(level)) {
- return logWorkbench(t, level);
- } else
- return NOLOG_DESCRIPTION;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java
deleted file mode 100644
index 0810e2d..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.proxy.ILogRenderer;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Log renderer to the console.
- *
- * @since 1.0.0
- */
-public class ConsoleLogRenderer extends AbstractWorkBenchRenderer {
-
- /**
- * Constructor taking a logger.
- *
- * @param logger
- *
- * @since 1.0.0
- */
- public ConsoleLogRenderer(Logger logger) {
- super(logger);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String)
- */
- public String log(String msg) {
-
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String, java.util.logging.Level, boolean)
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- if (!loggedToWorkbench || !consoleLogOn) {
- if (l == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java
deleted file mode 100644
index 0473318..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.io.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Logger that also logs to a trace file in the plugin's metadata area.
- *
- * @since 1.0.0
- */
-public class DefaultPluginTraceRenderer extends AbstractWorkBenchRenderer {
-
- /**
- * Name of the trace file in the metadata area.
- *
- * @since 1.0.0
- */
- public static final String PluginTraceFileName = "/.log"; //$NON-NLS-1$
-
- private String fTraceFile = null;
-
- private PrintWriter traceFile = null;
-
- /**
- * DefaultUILogRenderer constructor.
- *
- * @param logger
- */
- public DefaultPluginTraceRenderer(Logger logger) {
- super(logger);
-
- fTraceFile = Platform.getStateLocation(fMyBundle).toString() + PluginTraceFileName;
- (new File(fTraceFile)).delete(); // Start from fresh ... do not want to leak on disk space
-
- }
-
- private void closeTraceFile() {
- if (traceFile == null)
- return;
- try {
- traceFile.flush();
- traceFile.close();
- } finally {
- traceFile = null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String)
- */
- public String log(String msg) {
-
- System.out.println(msg);
-
- openTraceFile();
- if (traceFile != null) {
- traceFile.println(msg);
- closeTraceFile();
- }
- return fTraceFile;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String, java.util.logging.Level, boolean)
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- if (!loggedToWorkbench || !consoleLogOn) {
- if (l == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- }
-
- openTraceFile();
- if (traceFile != null) {
- traceFile.println(msg);
- closeTraceFile();
- }
- }
-
- private void openTraceFile() {
- try {
- traceFile = new PrintWriter(new FileOutputStream(fTraceFile, true));
- } catch (IOException e) {
- // there was a problem opening the log file so log to the console
- traceFile = null;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
deleted file mode 100644
index 8591267..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Get an Eclipse logger. This gets a logger that knows it is for a plugin.
- *
- * For each plugin, the following can be specified in the .option file:
- * {plugin-id}/debug/logTrace
- * The values valid for this are "true", "false", or "default". If true then loggers will be set into
- * trace mode. This means everything logged (even those that are filtered out due to not meeting log level)
- * will be traced out. If the value is "true" they will be traced to the system console.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logTrace" .options setting.
- * If not set there, then default value will be false.
- *
- * {plugin-id}/debug/logTraceFile
- * The values valid for this are "true", "false", or "default". If true then loggers will trace to
- * the system console AND to the ".log" file in the plugins work area in the metadata section of the workspace.
- * If "false" then not traced to a trace file.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logTraceFile" .options setting.
- * If not set there, then default value will be false.
- *
- * {plugin-id}.debug/logLevel
- * The values valid for this are the names from <code>java.util.logging.Level</code>, and "default". These
- * are the trace cutoff levels to use. For instance, if the level was SEVERE, then only level SEVERE msgs
- * are logged. The rest are skipped. Or if the level was WARNING, then only level SEVERE and WARNING are
- * logged.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logLevel" .options setting.
- * If not set there, then default value will be WARNING.
- *
- *
- * @since 1.0.0
- */
-public class EclipseLogger extends Logger {
-
- public static final String DEBUG_TRACE_OPTION = "/debug/logtrace"; //$NON-NLS-1$
- public static final String DEBUG_TRACE_FILE_OPTION = "/debug/logtracefile"; //$NON-NLS-1$
- public static final String DEBUG_LOG_LEVEL_OPTION = "/debug/loglevel"; // The logging level to use when no Hyaedes. (which we don't support at this time). //$NON-NLS-1$
- public static final String DEFAULT_OPTION = "default"; // If option value is this, then the value from WTP Common plugin options will be used for both logTrace and logLevel. //$NON-NLS-1$
-
- /**
- * Return a logger based upon the Plugin.
- * @param plugin
- * @return
- *
- * @since 1.0.0
- */
- public static Logger getEclipseLogger(Plugin plugin) {
- return getEclipseLogger(plugin.getBundle());
- }
-
- /**
- * Return a logger based upon the bundle.
- *
- * @param bundle
- * @return
- *
- * @since 1.0.0
- */
- public static Logger getEclipseLogger(Bundle bundle) {
- String id = bundle.getSymbolicName();
- Logger logger = getLoggerIfExists(id);
- if (logger != null)
- return logger;
-
- logger = getLogger(id); // Create one, we will now customize it.
-
- String pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_OPTION);
- boolean logTrace = "true".equalsIgnoreCase(pluginOption); //$NON-NLS-1$
-
- pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_FILE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_FILE_OPTION);
- boolean logTraceFile = "true".equalsIgnoreCase(pluginOption); //$NON-NLS-1$
-
- pluginOption = Platform.getDebugOption(id + DEBUG_LOG_LEVEL_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_LOG_LEVEL_OPTION);
-
- Level logLevel = Level.WARNING;
- if (pluginOption != null) {
- try {
- logLevel = Level.parse(pluginOption);
- } catch (IllegalArgumentException e) {
- }
- }
-
- if (logTrace)
- logger.setTraceMode(true);
- logger.setLevel(logLevel);
- if (!logTraceFile)
- logger.setRenderer(new ConsoleLogRenderer(logger));
- else
- logger.setRenderer(new DefaultPluginTraceRenderer(logger));
-
- return logger;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java
deleted file mode 100644
index 58f45d5..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Interface for a message logger.
- *
- * @since 1.0.0
- */
-public interface IMsgLogger {
- public Logger getMsgLogger();
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java
deleted file mode 100644
index a7b9b8f..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: JEMUtilPlugin.java,v $$
- * $$Revision: 1.5 $$ $$Date: 2006/05/17 20:13:45 $$
- */
-package org.eclipse.jem.util.plugin;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.internal.util.emf.workbench.WorkspaceResourceNotifier;
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Plugin for EMFWorkbench utils.
- *
- * @since 1.0.0
- */
-public class JEMUtilPlugin extends Plugin {
-
- public static final String ID = "org.eclipse.jem.util"; //$NON-NLS-1$
-
- /**
- * Plugin id of this plugin.
- *
- * @since 1.0.0
- */
- public static final String PLUGIN_ID = ID;
-
- /**
- * UI Context extension point.
- *
- * @since 1.0.0
- */
- public static final String UI_CONTEXT_EXTENSION_POINT = "uiContextSensitiveClass"; //$NON-NLS-1$
-
- /**
- * UITester element name.
- *
- * @since 1.0.0
- */
- public static final String UI_TESTER_EXTENSION_POINT = "uiTester"; //$NON-NLS-1$
-
- /**
- * Protocol for workspace
- *
- * @since 1.0.0
- */
- public static final String WORKSPACE_PROTOCOL = "workspace"; //$NON-NLS-1$
-
- /**
- * Protocol for platform uri's. i.e. "platform:/..."
- *
- * @since 1.0.0
- *
- */
- public static final String PLATFORM_PROTOCOL = "platform"; //$NON-NLS-1$
-
- /**
- * Resource indication in platform protocol. Indicates url is for a resource in the workspace. i.e. "platform:/resource/projectname/..."
- *
- * @since 1.0.0
- */
- public static final String PLATFORM_RESOURCE = "resource"; //$NON-NLS-1$
-
- /**
- * Plugin indication in platform protocol. Indicates url is for a file/directory in the plugins area. i.e. "platform:/plugin/pluginid/..."
- *
- * @since 1.0.0
- */
- public static final String PLATFORM_PLUGIN = "plugin"; //$NON-NLS-1$
-
- private static WorkspaceResourceNotifier sharedCache;
-
- private static ResourceSet pluginResourceSet;
-
- private static String[] GLOBAL_LOADING_PLUGIN_NAMES;
-
- private static JEMUtilPlugin DEFAULT;
-
- public JEMUtilPlugin() {
- super();
- DEFAULT = this;
- }
-
- /**
- * Get the workspace. Just use ResourcePlugin.getWorkspace() instead.
- *
- * @return
- *
- * @since 1.0.0
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Get the plugin instance.
- *
- * @return plugin instance.
- *
- * @since 1.0.0
- */
- public static JEMUtilPlugin getDefault() {
- return DEFAULT;
- }
-
- /**
- * Gets the sharedCache.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @return a WorkspaceResourceNotifier
- * @since 1.0.0
- */
- public static WorkspaceResourceNotifier getSharedCache() {
- if (sharedCache == null)
- sharedCache = new WorkspaceResourceNotifier();
- return sharedCache;
- }
-
- /**
- * Sets the sharedCache.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @param sharedCache
- * The sharedCache to set
- * @since 1.0.0
- */
- public static void setSharedCache(WorkspaceResourceNotifier aSharedCache) {
- sharedCache = aSharedCache;
- }
-
- /**
- * @deprecated use createIsolatedResourceSet(IProject)
- */
- public static ResourceSet createIsolatedResourceSet() {
- return null;
- }
-
- /**
- * Add an Adapter. You can use this api to listen for any shared resource being loaded or removed from any ProjectResourceSet in the Workbench
- * instead of trying to listen to each individual ProjectResourceSet.
- *
- * @param adapter
- *
- * @since 1.0.0
- */
- public static void addWorkspaceEMFResourceListener(Adapter adapter) {
- if (adapter != null && !getSharedCache().eAdapters().contains(adapter))
- getSharedCache().eAdapters().add(adapter);
- }
-
- /**
- * Removes the adapter.
- *
- * @param adapter
- *
- * @see #addWorkspaceEMFResourceListener(Adapter)
- * @since 1.0.0
- */
- public static void removeWorkspaceEMFResourceListener(Adapter adapter) {
- if (adapter != null)
- getSharedCache().eAdapters().remove(adapter);
- }
-
- /**
- * Is this plugin active.
- *
- * @return <code>true</code> if active
- *
- * @since 1.0.0
- */
- public static boolean isActivated() {
- Bundle bundle = Platform.getBundle(ID);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
- return false;
- }
-
- /**
- * This method will be called when a WorkbenchContext is instantiated on an EMFNature.
- * <p>
- * This not meant to be called by clients.
- * </p>
- *
- * @param aResourceSet
- *
- * @see plugin.xml#ResourceHandlerExtension extension point.
- * @since 1.0.0
- */
- public void addExtendedResourceHandlers(ProjectResourceSet aResourceSet) {
- if (aResourceSet == null)
- return;
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint(getBundle().getSymbolicName(), "ResourceHandlerExtension"); //$NON-NLS-1$
- IExtension[] extension = pct.getExtensions();
- IExtension config;
- for (int l = 0; l < extension.length; ++l) {
- config = extension[l];
- IConfigurationElement[] cElems = config.getConfigurationElements();
- ResourceHandler handler = null;
- for (int i = 0; i < cElems.length; i++) {
- try {
- handler = (ResourceHandler) cElems[i].createExecutableExtension("run"); //$NON-NLS-1$
-
- } catch (Exception ex) {
- handler = null;
- }
- if (handler != null)
- aResourceSet.add(handler);
- }
- }
- }
-
- /**
- * Delete the contents of the directory (and the directory if deleteRoot is true).
- * @param root
- * @param deleteRoot <code>true</code> to delete the root directory too.
- * @param monitor
- * @return <code>true</code> if there was an error deleting anything.
- *
- * @since 1.1.0
- */
- public static boolean deleteDirectoryContent(File root, boolean deleteRoot, IProgressMonitor monitor) {
- boolean error = false;
- if (root.canRead()) {
- if (root.isDirectory()) {
- File[] files = root.listFiles();
- monitor.beginTask(MessageFormat.format(EMFWorkbenchResourceHandler.getString("ProjectUtil_Delete_1"), new Object[] {root.getName()}), files.length+(deleteRoot ? 1 : 0)); //$NON-NLS-1$
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory())
- error |= deleteDirectoryContent(files[i], true, new SubProgressMonitor(monitor, 1));
- else {
- error |= !files[i].delete();
- }
- monitor.worked(1);
- }
- } else {
- monitor.beginTask(MessageFormat.format(EMFWorkbenchResourceHandler.getString("ProjectUtil_Delete_1"), new Object[] {root.getName()}), 1); //$NON-NLS-1$
- }
- if (deleteRoot) {
- error |= !root.delete();
- monitor.worked(1);
- }
- monitor.done();
- } else {
- error = true;
- }
- return error;
- }
-
- /**
- * Add a clean resource changelistener.
- * @param listener
- * @param eventMask mask of event types to listen for in addition to ones that are necessary for clean. Use 0 if no additional ones.
- *
- * @since 1.1.0
- */
- public static void addCleanResourceChangeListener(CleanResourceChangeListener listener, int eventMask) {
- // PRE_BUILD: Handle Clean.
- // TODO Until https://bugs.eclipse.org/bugs/show_bug.cgi?id=101942 is fixed, we must do POST_BUILD, that will probably be sent because a clean will cause a build to occur which should cause a delta.
- ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, eventMask | IResourceChangeEvent.POST_BUILD);
- }
-
- /**
- * A resource listener that can be used in addition to listen for Clean requests and process them.
- * <p>
- * Use <code>{@link IResourceChangeEvent#PRE_BUILD}</code> when adding as listener to get the
- * clean events.
- * <p>
- * <b>Note</b> : TODO Until https://bugs.eclipse.org/bugs/show_bug.cgi?id=101942 is fixed, you must do POST_BUILD, that will probably be sent because a clean will cause a build to occur which should cause a delta.
- * @since 1.1.0
- */
- public abstract static class CleanResourceChangeListener implements IResourceChangeListener {
-
- public void resourceChanged(IResourceChangeEvent event) {
- // Subclasses can override this to handle more events than just clean.
- if (event.getBuildKind() == IncrementalProjectBuilder.CLEAN_BUILD) {
- if (event.getSource() instanceof IProject)
- cleanProject((IProject) event.getSource());
- else if (event.getSource() instanceof IWorkspace)
- cleanAll();
- }
- }
-
- /**
- * Clear out the project.
- * @param project
- *
- * @since 1.1.0
- */
- protected abstract void cleanProject(IProject project);
-
- /**
- * Clean all.
- * <p>
- * By default this will simply call a clean project on each open project. Subclasses should override and either
- * add more function to clear out non-project data and then call super. Or if they can handle all of the projects
- * in a faster way, then can completely handle this.
- *
- * @since 1.1.0
- */
- protected void cleanAll() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- if (project.isOpen()) {
- cleanProject(project);
- }
- }
- }
- }
-
- /**
- * Get the project resource set for the plugin (there is one for the whole system).
- *
- * @return system-wide resource set.
- * @since 1.0.0
- */
- public static ResourceSet getPluginResourceSet() {
- if (pluginResourceSet == null)
- pluginResourceSet = new ProjectResourceSetImpl(null);
- return pluginResourceSet;
- }
-
- /**
- * Set the system-wide resource set.
- *
- * @param set
- * @since 1.0.0
- */
- public static void setPluginResourceSet(ResourceSet set) {
- pluginResourceSet = set;
- }
-
- /**
- * Get the global loading plugin names.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @return
- *
- * @since 1.0.0
- */
- public static String[] getGlobalLoadingPluginNames() {
- if (GLOBAL_LOADING_PLUGIN_NAMES == null)
- GLOBAL_LOADING_PLUGIN_NAMES = readGlobalLoadingPluginNames();
- return GLOBAL_LOADING_PLUGIN_NAMES;
- }
-
- /**
- * Get the Logger for this plugin.
- *
- * @return logger for this plugin.
- *
- * @since 1.0.0
- */
- public static Logger getLogger() {
- return Logger.getLogger(ID);
- }
-
- private static String[] readGlobalLoadingPluginNames() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IExtensionPoint exPoint = reg.getExtensionPoint(ID, "globalPluginResourceLoad"); //$NON-NLS-1$
- IExtension[] extensions = exPoint.getExtensions();
- String[] names = new String[extensions.length];
- if (extensions.length > 0) {
- for (int i = 0; i < extensions.length; i++)
- names[i] = extensions[i].getContributor().getName();
- }
- return names;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
deleted file mode 100644
index 3186a36..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-This is a stub plugin for perfmsr. It is here just so that org.eclipse.jem.util can compile.
-
-It should not be an open project during normal usage. Whenever any of the files in this project
-are changed, "perfmsr.jardesc" should be used to create the new changed appropriate jar. Do this by:
-
-1) Select perfmsr.jardesc
-2) On popup menu select "Create JAR"
-3) Hit "Finish"
-4) Commit all changes to CVS.
-5) Go to org.eclipse.jem.util project, select the org.eclipse.perfmsr.core.stub folder
- and select Replace->Latest from HEAD. This will cause your just committed changes
- from step 4 to be put into org.eclipse.jem.util and will be picked up for that
- plugin to compile against.
-6) Either close or delete the org.eclipse.perfmsr.core.stuf project from the workspace.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
deleted file mode 100644
index f9f238e..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>30th March, 2004</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the EPL and can be made available to others under the terms of the EPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the EPL ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the EPL and such Modifications can be made available to others under the terms of
-the EPL.</p>
-
-<p><b>Version:</b> v20040624a
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
deleted file mode 100644
index 3a4db57..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- *.jar
-source.perfmsr.jar = src/
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jar b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jar
deleted file mode 100644
index 1ebba8f..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
deleted file mode 100644
index d48e223..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jardesc>
- <jar path="org.eclipse.perfmsr.core.stub/perfmsr.jar"/>
- <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.perfmsr.core.stub/perfmsr.jardesc" exportErrors="true" exportWarnings="true" overwrite="false" saveDescription="true" useSourceFolders="false"/>
- <manifest generateManifest="true" manifestLocation="/VEScrapProject/MANIFEST.mf" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
- <sealing sealJar="false">
- <packagesToSeal/>
- <packagesToUnSeal/>
- </sealing>
- </manifest>
- <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
- <javaElement handleIdentifier="=org.eclipse.perfmsr.core.stub/src"/>
- </selectedElements>
-</jardesc>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
deleted file mode 100644
index 5720eeb..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Plugin.name=Performance Monitor
-
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
deleted file mode 100644
index 596926d..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.perfmsr.core"
- name="%Plugin.name"
- version="3.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.perfmsr.core.PerfMsrCorePlugin">
-
- <runtime>
- <library name="perfmsr.jar"><export name="*"/></library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-</plugin>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
deleted file mode 100644
index bd992c7..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
+++ /dev/null
@@ -1,195 +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.perfmsr.core;
-
-/**
- * Take snapshots of the various performance counters.
- * ************* This is just a stub of the real interface to get org.eclipse.jem.util
- * to compile. It is not usable by itself. ****************************
- */
-public interface IPerformanceMonitor
-{
- /**
- * These constants control how much information is gathered for a particular snapshot.
- * They are or'ed together and passed into the snapshot method.
- */
- interface Types
- {
- /**
- * 1 - Write out the performance counters from the operating system. These
- * include working set, peak working set, elapsed time, user time, and
- * kernel time.
- */
- int OperatingSystemCounters = 1;
-
- /**
- * 2 - Write out the global performance info. This includes things like the total
- * committed memory for the entire system.
- *
- * This function depends on the GetPerformanceInfo() function being available in
- * the Windows psapi.dll. This is available in XP but is usually not available
- * in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
- */
- int GlobalSystemCounters = 2;
-
- /**
- * 4 - Write out the size of the Java Heap.
- */
- int JavaHeapSize = 4;
-
- /**
- * 8 - Write out how much of the Java heap is being used. This calls the
- * garbage collector so it may skew timing results.
- */
- int JavaHeapUsed = 8;
-
- /**
- * 16 - The plugin startup and size information.
- */
- int PluginInfo = 16;
-
- /** 0xffff - Everything. */
- int All = 0xffff;
- }
-
- /**
- * Add some more "extra" variations.
- *
- * The variations that are in effect are made up of these extra variations plus any variations
- * that may have been set with the setVar() method.
- *
- * @param varList a comma separated list of variations
- */
- public void addVarAppend(String varList);
-
- /**
- * Set the driver name.
- *
- * @param driver a label that identifies the driver that is being tested. If it is a WSAD
- * driver, this will usually be set by the extension.
- */
- public void setDriver(String driver);
-
- /**
- * Set the location of the performance measurement file, that is the place where
- * the measurements are stored.
- *
- * @param logFile the file name of where the log should be written. Usually this is fully qualified
- * path name. For example "x:\logs\timer.xml".
- */
- public void setLogFile(String logFile);
-
- /**
- * Set the performance monitor to be on or off. If it is off then most of the other
- * operations will no-op.
- *
- * The default is for the performance monitor to be off unless it's special environment variable is set.
- * When called from the UI, the UI should call this to make sure that it is on.
- */
- public void setIsOn(boolean isOn);
-
- /**
- * Sets the test case number for this measurement run.
- *
- * @param testd test case identifier
- */
- public void setTestd(int testd);
-
- /**
- * Sets the test case name. If will cause a new test case to be created if it does not already exist.
- *
- * @param testName a simple (short) test case name. In the case of JUnit test cases, it would usually
- * be the JUnit name.
- */
- public void setTestName(String testName);
-
- /**
- * Set the variations that are in effect.
- *
- * @param var a comma delimited string of variation numbers
- */
- public void setVar(String var);
-
- /**
- * Set the upload host
- *
- * @param host DNS name of the upload host
- */
- public void setUploadHost(String host);
-
- /**
- * Set the upload port
- *
- * @param port upload port
- */
- public void setUploadPort(int port);
-
- /**
- * Set the upload userid
- *
- * @param userid
- */
- public void setUploadUserid(String userid);
-
- /**
- * Take a snapshot of some default performance measurements.
- *
- * @param step this identifies the step that the snapshot is for
- */
- void snapshot(int step);
-
- /**
- * Take a snapshot of the selected performance measurements.
- *
- * @param step this identifies the step that the snapshot is for
- *
- * @param types This controls which measurements are selected. It is an or'd together
- * list of the IPerformanceMonitor.Types constants.
- *
- * @see IPerformanceMonitor.Types
- */
- void snapshot(int step, int types);
-
- /**
- * Write the comment to the performance measurement file.
- *
- * @param comment
- */
- void writeComment(String comment);
-
- /**
- * Upload the results to the server. This causes the file to be
- * closed, and the monitor to be placed into the finished state.
- *
- * This method can only be called if the uploadhost, uploadport and uploaduserid
- * have been configured before hand.
- *
- * @param description an optional description (it can be null)
- *
- * @return some status information
- */
- public Upload.Status upload(String description);
-//
-// /**
-// * Upload the results to the server. This causes the file to be
-// * closed, and the monitor to be placed into the finished state.
-// *
-// * @param host the host name that the file is being sent to
-// * @param port the port on the host
-// * @param userid the userid that is doing the upload
-// * @param description an optional description (it can be null)
-// *
-// * @return some status information
-// */
-// Upload.Status upload(String host, int port, String userid, String description);
-
-
-}
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
deleted file mode 100644
index 655ba2a..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.perfmsr.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * ************* This is just a stub of the real class to get org.eclipse.jem.util
- * to compile. It is not usable by itself. ****************************
- * @since 1.0.0
- */
-public class PerfMsrCorePlugin extends Plugin {
-
- public static IPerformanceMonitor getPerformanceMonitor(boolean bool) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
deleted file mode 100644
index 65fa677..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.perfmsr.core;
-
-
-/**
- * Upload.
- * ************* This is just a stub of the real interface to get org.eclipse.jem.util
- * to compile. It is not usable by itself. ****************************
- */
-public interface Upload {
- public static class Status {
- public boolean success;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/plugin.properties b/plugins/org.eclipse.jem.util/plugin.properties
deleted file mode 100644
index a53db6a..0000000
--- a/plugins/org.eclipse.jem.util/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/common.move/webtools.common.git/plugins/org.eclipse.jem.util/plugin.properties,v $
-# $Revision: 1.2 $ $Date: 2005/02/15 23:07:45 $
-#
-
-
-pluginName=Java EMF Model Utilities
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.jem.util/plugin.xml b/plugins/org.eclipse.jem.util/plugin.xml
deleted file mode 100644
index 591be42..0000000
--- a/plugins/org.eclipse.jem.util/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- Extension point to register ResourceHandlers that will always be added to
- new WorkbenchContexts -->
- <extension-point id="ResourceHandlerExtension" name="ResourceHandlerExtension"/>
- <extension-point id="globalPluginResourceLoad" name="Global Plugin Resource Load"/>
- <extension-point id="nature_registration" name="EMF Nature registration"/>
- <extension-point id="internalWorkbenchContextFactory" name="Internal Workbench Context Factory"/>
- <extension-point id="uiContextSensitiveClass" name="UI Context Sensitive Class" schema="schema/uiContextSensitiveClass.exsd"/>
- <extension-point id="uiTester" name="UI Tester" schema="schema/uiTester.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties b/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
deleted file mode 100644
index cad9483..0000000
--- a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-EMFWorkbenchContextBase_ERROR_0=IWAE0003E Method not yet implemented.
-EMFWorkbenchContextBase_ERROR_1=IWAE0005E Project can not be null.
-EMFWorkbenchContextBase_ERROR_2=IWAE0006E Attempt to create resource set with null project
-EMFNatureRegistry_ERROR_0=IWAE0007E Duplicate EMF nature registration for id: {0}
-EMFWorkbenchContextFactory_UI_0=The project should not be null.
-EMFWorkbenchContextFactory_UI_1=The project \"{0}\" is not accessible.
-
-ProjectUtil_Delete_1=Deleting \"{0}\".
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd b/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd
deleted file mode 100644
index df70e98..0000000
--- a/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.util">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.util" id="uiContextSensitiveClass" name="UI Context Sensitive Class"/>
- </appInfo>
- <documentation>
- Components are often designed in such a way that the "Headless" or non-graphical portions are separate from the Graphical User Interface (GUI) portions. Sometimes this is done to follow good design principles, other times there is a specific use case for doing so. When plugins follow this practice because they must vary their behavior based on whether they are running in a headless environment or a graphical environment, they often need to choose the correct implementation of a particular type. The org.eclipse.jem.util.uiContextSensitiveClass extension point provided by the JEM component solves exactly this problem.
-<p>
-To use the extension point, you must provide two extensions that are linked by a key. The key is a unique String-based value that you will later use to instanitate your class.
-<p>
-The first usage of the extension specifies your key, and the Headless context, and the class that should be instantiated for this (key, context) pair. This means in the headless environment this class will be instantiated when requested.
-<p>
-The second extension specifies the UI context and the same key, but a different implementation designed for graphical environments. This means in the UI environment this other class will be instantiated when requested.
-<p>
-The actual request is done in your code via:
-<pre>
-IMyInterface instance = (IMyInterface) UIContextDetermination.createInstance("myKey");
-</pre>
-where <code>"myKey"</code> is the key used on both extensions. It will then choose either the UI or the Headless extension depending upon the context.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="uiContextSensitiveClass" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="uiContextSensitiveClass">
- <annotation>
- <documentation>
- An extension point that defines an instance of a class and its appropriate context (UI or Headless)
- </documentation>
- </annotation>
- <complexType>
- <attribute name="key" type="string" use="required">
- <annotation>
- <documentation>
- The key that should be used to create an instance of the Context Sensitive super class/interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- A concrete implementation for either a UI or Headless context.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="context" use="required">
- <annotation>
- <documentation>
- One of "UI" or "Headless" This is case-sensitive. It must match exactly as shown here.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="UI">
- </enumeration>
- <enumeration value="Headless">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- Usage for the UI context:
-<pre>
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - UI Context Class"
- point="org.eclipse.jem.util.ContextSensitiveClass">
- <uiContextSensitiveClass
- context="UI"
- key="workingCopyManager"
- className="com.ibm.wtp.common.ui.WTPUIWorkingCopyManager"/>
- </extension>
-</pre>
-<br>
-Usage for the Headless context:
-<pre>
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - Headless Context Class"
- point="org.eclipse.jem.util.ContextSensitiveClass">
- <uiContextSensitiveClass
- context="Headless"
- key="workingCopyManager"
- className="com.ibm.wtp.common.ui.WTPHeadlessWorkingCopyManager"/>
- </extension>
-</pre>
-<br>
-And finally the retrieval of the class for the current context:
-
-<pre>
-IWorkingCopyManager manager = (IWorkingCopyManager) UIContextDetermination.createInstance("workingCopyManager");
-</pre>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- See <code>org.eclipse.jem.util.UIContextDetermination</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) IBM 2003.
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.util/schema/uiTester.exsd b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
deleted file mode 100644
index 729ab32..0000000
--- a/plugins/org.eclipse.jem.util/schema/uiTester.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.util">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.util" id="uiTester" name="UI Tester"/>
- </appInfo>
- <documentation>
- This is used to tell JEM that it is running in a non-HEADLESS environment. Typically UI environment is non-HEADLESS. The default if there are no implementers of this extension point that return true is HEADLESS.
-<p>
-A HEADLESS environment is typically a batch situation where there is no UI and the workspace is used for one operation and then terminated. Most headless tasks are done under one operation and the JavaReflectionSynchronizer may not have a chance to flush a bad reflection before the real type needs to be found and can be found. So what would happen is if a class was created during this one operation it would not be found because the notifications had not yet gone out.
-<p>
-In a UI environment the operations are typically short and do only a few things and the results aren't needed until after the operation has completed. In that case it is more efficient to not keep checking if a class has appeared everytime a request is made, instead it will wait for the notification of the added class to appear before resetting the definition to allow checking again later.
-<p>
-If there is more than one implementer of this interface in the application, then it will go through each of them once until one returns true. As soon as one returns true it will stop and mark the application as being non-HEADLESS. This will be done only once for the application. It will not be again until the next session of the application.
-<p>
-This is typically an internal extension point only. The JEM UI plugin will provide an implementation that will return true if the Platform UI is active. So this will normally not be needed to be implemented by most customers.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="uiTester"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="uiTester">
- <annotation>
- <documentation>
- The uiTester definition element.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- The class name of the UITester for this extension. It must implement <samp>org.eclipse.jem.util.UITester</samp>.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jem.util.UITester"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of an implementer:
-
-<p>
-<pre>
- <extension point="org.eclipse.jem.util.uiTester">
- <uiTester
- className="com.example.UITesterImplementation"/>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The <samp>className</samp> attribute must be a fully-qualified class that implements the <samp>org.eclipse.jem.util.UITester</samp> interface for the tester.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- There is no default implementation for this class.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004, 2006 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.emf/.classpath b/plugins/org.eclipse.wst.common.emf/.classpath
index 96202d8..302a786 100644
--- a/plugins/org.eclipse.wst.common.emf/.classpath
+++ b/plugins/org.eclipse.wst.common.emf/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="wtpemf/"/>
<classpathentry kind="src" path="workbench/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <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">
<accessrules>
<accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
diff --git a/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
index 6c7418f..c296c08 100644
--- a/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,63 +1,95 @@
-#Sat Mar 24 02:06:02 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-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=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-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=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.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=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=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=ignore
-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=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+#Wed Jun 24 10:13:16 EDT 2009
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+eclipse.preferences.version=1
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
index 4175e36..fb302bf 100644
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.emf; singleton:=true
-Bundle-Version: 1.1.205.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Activator: org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
@@ -13,7 +13,7 @@
org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)"
+ org.eclipse.wst.common.core;bundle-version="[1.1.201,2.0.0)"
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.wst.common.emf/plugin.xml b/plugins/org.eclipse.wst.common.emf/plugin.xml
index dde6ad8..5dc13a6 100644
--- a/plugins/org.eclipse.wst.common.emf/plugin.xml
+++ b/plugins/org.eclipse.wst.common.emf/plugin.xml
@@ -24,7 +24,7 @@
</extension>
<extension
- point="org.eclipse.jem.util.uiContextSensitiveClass">
+ point="org.eclipse.wst.common.core.uiContextSensitiveClass">
<uiContextSensitiveClass
context="Headless"
key="rendererFactory"
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java
index 5034c7a..f7c6919 100644
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * 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
@@ -10,18 +10,16 @@
*******************************************************************************/
/*
* Created on Oct 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
package org.eclipse.wst.common.internal.emf;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.ILock;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapter;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
@@ -44,13 +42,13 @@
* The delay is default to 5 minutes. This is the upward threshhold. The
* lock will wait up to DELAY milliseconds to acquire the lock, and bail
* if not. It does not mean that it will wait DELAY milliseconds always.
- * In general, the wait should be almost instanteous -- just as long as
+ * In general, the wait should be almost instantaneous -- just as long as
* document loading remains speedy.
*/
private static final long DELAY = 300000;
public ResourceSynchronizedIsLoadingAdapter() {
- loadingLock = Platform.getJobManager().newLock();
+ loadingLock = Job.getJobManager().newLock();
if (loadingLock != null)
loadingLock.acquire();
}
@@ -61,6 +59,7 @@
*
* @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#waitForResourceToLoad()
*/
+ @Override
public void waitForResourceToLoad() {
if (loadingLock == null)
@@ -90,9 +89,8 @@
Notifier target = getTarget();
if (target == null || !(target instanceof Resource)) {
Resource resource = (Resource) target;
- System.err.println("[WARNING] Could not acquire Semaphore Lock for Resource: \"" + resource.getURI() + "\" in " + getClass());
+ EcoreUtilitiesPlugin.logError("[WARNING] Could not acquire Semaphore Lock for Resource: \"" + resource.getURI() + "\" in " + getClass()); //$NON-NLS-1$//$NON-NLS-2$
}
-
}
@@ -101,6 +99,7 @@
*
* @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
+ @Override
public void notifyChanged(Notification notification) {
if (notification.getNotifier() != null) {
@@ -119,6 +118,7 @@
*
* @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#forceRelease()
*/
+ @Override
public void forceRelease() {
if (loadingLock != null && loadingLock.getDepth() > 0)
loadingLock.release();
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java
index 1990e8a..901b3b6 100644
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java
@@ -10,9 +10,6 @@
*******************************************************************************/
/*
* Created on Oct 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
package org.eclipse.wst.common.internal.emf;
@@ -22,9 +19,6 @@
/**
* @author mdelder
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
public class ResourceSynchronizedIsLoadingAdapterFactory extends ResourceIsLoadingAdapterFactory {
@@ -32,7 +26,8 @@
/* (non-Javadoc)
* @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapterFactory#createResourceIsLoadingAdapter()
*/
- public ResourceIsLoadingAdapter createResourceIsLoadingAdapter() {
+ @Override
+ public ResourceIsLoadingAdapter createResourceIsLoadingAdapter() {
return new ResourceSynchronizedIsLoadingAdapter();
}
}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
index 1c24c05..1f19437 100644
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
+++ b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
@@ -21,6 +21,11 @@
import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapterFactory;
import org.osgi.framework.BundleContext;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import java.lang.Throwable;
+import org.eclipse.core.runtime.CoreException;
/**
* @author DABERG
@@ -29,6 +34,8 @@
* Generation>Code and Comments
*/
public class EcoreUtilitiesPlugin extends Plugin {
+ //the ID for this plugin (added automatically by logging quickfix)
+ public static final String PLUGIN_ID = "org.eclipse.wst.common.emf"; //$NON-NLS-1$
public static final String ID = "org.eclipse.wst.common.emf"; //$NON-NLS-1$
public static final String TRANSLATOR_EXTENSTION_POINT = "translatorExtension"; //$NON-NLS-1$
@@ -44,6 +51,7 @@
*
* @see org.eclipse.core.runtime.Plugin#startup()
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
RendererFactory.setDefaultHandler(PluginRendererFactoryDefaultHandler.INSTANCE);
@@ -52,4 +60,33 @@
//use a synchronized loading adapter factory
ResourceIsLoadingAdapterFactory.INSTANCE = new ResourceSynchronizedIsLoadingAdapterFactory();
}
+
+ 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() );
+ }
+
+ public static void logError(String message) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
+ }
+
+ public static void logWarning(String message) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log(createStatus(IStatus.WARNING, message));
+ }
+
+ public static void logWarning(Throwable exception) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.WARNING, exception.getMessage(), exception));
+ }
+
}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
index ee80757..4ad9dc9 100644
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
+++ b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
@@ -8,24 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
package org.eclipse.wst.common.internal.emf.plugin;
-import org.eclipse.jem.util.UIContextDetermination;
+import org.eclipse.wst.common.core.util.UIContextDetermination;
import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactoryDefaultHandler;
import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
public class PluginRendererFactoryDefaultHandler extends EMF2DOMRendererFactoryDefaultHandler {
static final PluginRendererFactoryDefaultHandler INSTANCE = new PluginRendererFactoryDefaultHandler();
@@ -43,6 +31,7 @@
*
* @see com.ibm.etools.emf2xml.EMF2DOMRendererFactoryDefaultHandler#getDefaultRendererFactory()
*/
+ @Override
public RendererFactory getDefaultRendererFactory() {
RendererFactory aFactory = (RendererFactory) UIContextDetermination.createInstance(EXT_POINT_NAME);
return aFactory == null ? super.getDefaultRendererFactory() : aFactory;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
index cff83b7..7a9545b 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
@@ -151,4 +151,8 @@
public boolean isBatchMode() {
return false;
}
+
+ public boolean isReverting() {
+ return false;
+ }
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
index b0d0869..32debc9 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
@@ -23,6 +23,7 @@
super(trans, version);
}
+ @Override
public final int scanNextTranslator(Translator[] children, int start) {
int found = start + 1;
for (; found < children.length; ++found) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
index e575833..18aebcd 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
@@ -315,6 +315,7 @@
return result;
}
+ @Override
public String toString() {
StringBuffer output = new StringBuffer("CacheEventNode[");//$NON-NLS-1$
output.append("nodeName=");//$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
index 03f4198..0ce8c85 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
@@ -27,6 +27,11 @@
/**
*
+ */
+ private static final long serialVersionUID = 1208895320149054103L;
+
+ /**
+ *
* @return the top of the stack without removing it
*/
public CacheEventNode peek() {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
index f824de3..6ac4bba 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
@@ -53,6 +53,7 @@
*
* @see org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl#createResource(org.eclipse.emf.common.util.URI)
*/
+ @Override
public Resource createResource(URI uri) {
return new CompatibilityXMIResourceImpl(uri);
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
index ee6ff3e..f26ca8e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
@@ -45,6 +45,7 @@
*
* @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#isNull()
*/
+ @Override
protected boolean isNull() {
boolean isnull = super.isNull();
if (!isnull)
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
index 5f17a46..26ebff7 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
@@ -41,6 +41,7 @@
*
* @see org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl#makeDefaultHandler()
*/
+ @Override
protected DefaultHandler makeDefaultHandler() {
return new SAXWrapper(new CompatibilitySAXXMIHandler(resource, helper, options));
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
index db9fe94..bb95f96 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
@@ -54,6 +54,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLHelper()
*/
+ @Override
protected final XMLHelper createXMLHelper() {
MappedXMIHelper helper = doCreateXMLHelper();
helper.setPackageURIsToPrefixes(getPackageURIsToPrefixes());
@@ -104,6 +105,7 @@
/**
* @see org.eclipse.emf.ecore.resource.Resource#getURIFragment(EObject)
*/
+ @Override
public String getURIFragment(EObject eObject) {
if (usesDefaultFormat())
return super.getURIFragment(eObject);
@@ -117,6 +119,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLSave()
*/
+ @Override
protected XMLSave createXMLSave() {
if (usesDefaultFormat())
return super.createXMLSave();
@@ -126,6 +129,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doSave(OutputStream, Map)
*/
+ @Override
public void doSave(OutputStream outputStream, Map options) throws IOException {
super.doSave(outputStream, options);
}
@@ -142,9 +146,10 @@
/**
* @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#getEObjectByID(String)
*/
+ @Override
protected EObject getEObjectByID(String id) {
if (idToEObjectMap != null) {
- EObject eObject = (EObject) idToEObjectMap.get(id);
+ EObject eObject = idToEObjectMap.get(id);
if (eObject != null) {
return eObject;
}
@@ -157,6 +162,7 @@
* {@link InternalEObject#eSetProxyURI sets}the object to be a proxy and clears the
* {@link #eAdapters adapters}.
*/
+ @Override
protected void unloaded(InternalEObject internalEObject) {
//overridden from the super class; call super.getURIFragment instead of the implementation
//at this level, to avoid ID generation during unload
@@ -171,6 +177,7 @@
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doLoad(java.io.InputStream,
* java.util.Map)
*/
+ @Override
public final void doLoad(InputStream inputStream, Map options) throws IOException {
basicDoLoad(inputStream, options);
}
@@ -187,11 +194,13 @@
*
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
*/
+ @Override
protected void init() {
super.init();
setEncoding(DEFAULT_ENCODING);
}
+ @Override
protected XMLLoad createXMLLoad() {
return new CompatibilityXMILoadImpl(createXMLHelper());
}
@@ -226,6 +235,7 @@
*
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#detachedHelper(org.eclipse.emf.ecore.EObject)
*/
+ @Override
protected void detachedHelper(EObject eObject) {
if (modificationTrackingAdapter != null) {
eObject.eAdapters().remove(modificationTrackingAdapter);
@@ -240,6 +250,7 @@
}
}
+ @Override
public void load(Map options) throws IOException {
ResourceIsLoadingAdapter adapter = null;
@@ -346,7 +357,8 @@
*
* @see org.eclipse.emf.ecore.resource.Resource#getContents()
*/
- public EList getContents() {
+ @Override
+ public EList getContents() {
waitForResourceToLoadIfNecessary();
return super.getContents();
}
@@ -356,7 +368,8 @@
*
* @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#isLoaded()
*/
- public boolean isLoaded() {
+ @Override
+ public boolean isLoaded() {
waitForResourceToLoadIfNecessary();
return super.isLoaded();
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
index c1a7bf2..2af74c3 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
@@ -47,6 +47,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#init(XMLResource, Map)
*/
+ @Override
protected void init(XMLResource resource, Map options) {
super.init(resource, options);
xmiType = true;
@@ -55,6 +56,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#addNamespaceDeclarations()
*/
+ @Override
public void addNamespaceDeclarations() {
doc.addAttribute(XMI_VER_NS, XMIResource.VERSION_VALUE);
doc.addAttribute(XMI_XMLNS, XMIResource.XMI_URI);
@@ -105,6 +107,7 @@
}
}
+ @Override
protected void saveHref(EObject remote, EStructuralFeature f) {
String name = helper.getQName(f);
String href = helper.getHREF(remote);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
index 356f102..ceaa9f8 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
@@ -37,6 +37,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public Object getMOFValue(EObject mofObject) {
return attributeValue;
}
@@ -46,6 +47,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public boolean isSetMOFValue(EObject emfObject) {
return true;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
index c7d1c62..3f48221 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
@@ -48,45 +48,55 @@
return child;
}
+ @Override
public List getMOFChildren(EObject mofObject) {
//return super.getMOFChildren(getChild(mofObject));
return super.getMOFChildren(mofObject);
}
+ @Override
public Object getMOFValue(EObject mofObject) {
return super.getMOFValue(getChild(mofObject));
}
+ @Override
public void setMOFValue(EObject emfObject, Object value) {
//super.setMOFValue(getChild(emfObject), value);
super.setMOFValue(getChild(emfObject), value, -1);
}
+ @Override
public void setMOFValue(Notifier owner, Object value, int newIndex) {
super.setMOFValue(getChild((EObject) owner), value, newIndex);
}
+ @Override
public void removeMOFValue(Notifier owner, Object value) {
super.removeMOFValue(getChild((EObject) owner), value);
}
+ @Override
public boolean isSetMOFValue(EObject emfObject) {
return super.isSetMOFValue(getChild(emfObject));
}
+ @Override
public void unSetMOFValue(EObject emfObject) {
super.unSetMOFValue(getChild(emfObject));
}
+ @Override
public boolean isDependencyChild() {
return true;
}
+ @Override
public boolean featureExists(EObject emfObject) {
return super.featureExists(getChild(emfObject));
}
+ @Override
public void clearList(EObject mofObject) {
super.clearList(getChild(mofObject));
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
index 124c727..8b6dcc1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
@@ -30,6 +30,7 @@
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.eclipse.wst.common.internal.emf.utilities.Assert;
import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession;
@@ -72,6 +73,7 @@
static final String KEY = "EMF2DOMDependencyAdapter"; //$NON-NLS-1$
+ @Override
public void notifyChanged(Notification msg) {
EMF2DOMAdapterImpl.this.notifyChanged(msg);
}
@@ -79,6 +81,7 @@
/**
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(Object)
*/
+ @Override
public boolean isAdapterForType(Object type) {
return KEY.equals(type);
}
@@ -136,8 +139,8 @@
try {
// If the Platform class can be found, then continue to check if the OSGI platform is running
Class clazz = Class.forName(PLATFORM);
- Method m = clazz.getMethod(ISRUNNING, null);
- isRunning = ((Boolean)m.invoke(clazz, null)).booleanValue();
+ Method m = clazz.getMethod(ISRUNNING);
+ isRunning = ((Boolean)m.invoke(clazz)).booleanValue();
} catch (ClassNotFoundException e) {
// Ignore because this must be in a non_OSGI environment
} catch (SecurityException e) {
@@ -203,6 +206,7 @@
fNotificationEnabled = isEnabled;
}
+ @Override
public boolean isAdapterForType(Object type) {
return EMF2DOMAdapter.ADAPTER_CLASS == type;
}
@@ -211,6 +215,7 @@
target.eAdapters().add(this);
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(shortClassName(this));
@@ -262,11 +267,11 @@
break;
}
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("MOF Change: " + notifType); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tnotifier : " + msg.getNotifier()); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tchangedFeature: " + msg.getFeature()); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\toldValue : " + msg.getOldValue()); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tnewValue : " + msg.getNewValue()); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("MOF Change: " + notifType); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tnotifier : " + msg.getNotifier()); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tchangedFeature: " + msg.getFeature()); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\toldValue : " + msg.getOldValue()); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tnewValue : " + msg.getNewValue()); //$NON-NLS-1$
}
}
@@ -287,6 +292,52 @@
}
return null;
}
+
+ /**
+ * Checks to ensure that only one MOF node has been removed and will remove the dom equivalent.
+ * If multiple differences are found, will return the index of the first difference.
+ *
+ * @param parent
+ * @param mofChildren
+ * @param domChildren
+ * @return
+ */
+ private int updateDOMSingleRemove(Node parent, List mofChildren, List domChildren){
+ int domIndex = 0;
+ int firstDifference = -1;
+ for (Object mofChild : mofChildren){
+ if (mofChild instanceof EObject)
+ {
+ EMF2DOMAdapter adapter = getExistingAdapter((EObject)mofChild);
+ if(adapter.getNode() != domChildren.get(domIndex)){
+ if(firstDifference != -1){
+ //second difference; return
+ return firstDifference;
+ }
+ //we found something that is different
+ firstDifference = domIndex;
+ //skip over one index and check against next
+ domIndex ++;
+ if(adapter.getNode() != domChildren.get(domIndex)){
+ //if these are different then there are multiple changes
+ return firstDifference;
+ }
+ }
+ domIndex++;
+ }
+ }
+ if(firstDifference != -1){
+ removeDOMChild(parent, (Element) domChildren.get(firstDifference));
+ //if we are here, and firstDifference is not -1, that means we have iterated
+ //through the entire mof list, and all elements have been processed. Return
+ //domchildren.size, so that no more processing is done in calling method.
+ return domChildren.size();
+ }
+ //if we are here, then firstDifference was -1. Our algo has failed. Let original algo run.
+ return 0;
+ }
+
+
/**
* Update all the children of the target MOF object in the relationship described by
@@ -299,18 +350,23 @@
*/
protected void primUpdateDOMMultiFeature(Translator map, Node node, List mofChildren, List domChildren, Notifier owner) {
+ int i = 0;
+ Node parent = findDOMPath(node, map, false);
+ if(domChildren.size() - mofChildren.size() == 1){
+ //an emf object has been deleted. Remove it from the dom as well
+ i = updateDOMSingleRemove(parent, mofChildren, domChildren);
+ }
//Used for inserting primitives
List inorderDOMChildren = null;
- if (!map.isObjectMap() || map.isManagedByParent()) {
- inorderDOMChildren = new ArrayList();
- inorderDOMChildren.addAll(domChildren);
+ if(i < mofChildren.size()){
+ if (!map.isObjectMap() || map.isManagedByParent()) {
+ inorderDOMChildren = new ArrayList();
+ inorderDOMChildren.addAll(domChildren);
+ }
}
- Node parent = findDOMPath(node, map, false);
-
// Go though the MOF children checking to see if the corresponding
// MOF Adapter children exists. If not, create the adapter.
// Also handles reordering children that have moved.
- int i = 0;
for (; i < mofChildren.size(); i++) {
Object child = mofChildren.get(i);
EObject mofChild = null;
@@ -365,7 +421,9 @@
indent(newNode, map);
addDOMAdapter(newNode); // Hook up listeners
domChildren.add(i, newNode);
- inorderDOMChildren.add(newNode);
+ if(inorderDOMChildren != null){
+ inorderDOMChildren.add(newNode);
+ }
Text newText = parent.getOwnerDocument().createTextNode(map.convertValueToString(child, (EObject) owner));
DOMUtilities.insertBeforeNode(newNode, newText, null);
}
@@ -641,8 +699,8 @@
removeDOMAdapter(childNode, attrAdapter);
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tCHILD: Adding DOM adapter: " + this); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\t\tto: " + childNode); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tCHILD: Adding DOM adapter: " + this); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\t\tto: " + childNode); //$NON-NLS-1$
}
primAddDOMAdapter(childNode, this);
}
@@ -657,7 +715,7 @@
removeDOMChild(parentNode, childNode, false);
parentNode.insertBefore(childNode, insertBeforeNode);
} catch (Exception e) {
- e.printStackTrace();
+ EcoreUtilitiesPlugin.logError(e);
}
}
@@ -694,7 +752,7 @@
removeAdapters(childNode);
parentNode.removeChild(childNode);
} catch (Exception e) {
- e.printStackTrace();
+ EcoreUtilitiesPlugin.logError(e);
}
}
@@ -983,9 +1041,9 @@
if (resource != null) {
publicId = resource.getPublicId();
systemId = resource.getSystemId();
+ if (!(StringUtil.stringsEqual(publicId, oldPublicId) && StringUtil.stringsEqual(systemId, oldSystemId)))
+ fRenderer.replaceDocumentType(resource.getDoctype(), publicId, systemId);
}
- if (!(StringUtil.stringsEqual(publicId, oldPublicId) && StringUtil.stringsEqual(systemId, oldSystemId)))
- fRenderer.replaceDocumentType(resource.getDoctype(), publicId, systemId);
}
protected void updateDOMDocumentType(Notification msg) {
@@ -1011,6 +1069,7 @@
resource.setDoctypeValues(publicId, systemId);
}
+ @Override
public void notifyChanged(Notification msg) {
if (isRoot) {
@@ -1077,8 +1136,8 @@
primAddDOMAdapter(fNode, this);
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Adding DOM adapter: " + this); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tto: " + fNode); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Adding DOM adapter: " + this); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tto: " + fNode); //$NON-NLS-1$
}
// Go through the maps. All of the DOM nodes that are not listened
@@ -1201,7 +1260,7 @@
handleInvalidMultiNodes(nodeName);
node = (Node) nodes.get(0);
if (node != null) {
- if (addAdapters && (map != null || map.isManagedByParent()))
+ if (addAdapters)
addDOMAdapter(curNode);
break;
}
@@ -1373,7 +1432,13 @@
Attr domAttr = (Attr) child.getAttributes().getNamedItem(map.getDOMName(mofObject));
if (domAttr != null) {
domValue = domAttr.getValue();
- domValue = map.convertStringToValue((String) domValue, mofObject);
+ try {
+ domValue = map.convertStringToValue((String) domValue, mofObject);
+ } catch (FeatureValueConversionException e) {
+ handleFeatureValueConversionException(e);
+ domValue = null;
+ }
+
} else
isUnset = true;
} else {
@@ -1439,7 +1504,7 @@
// enum
// features
- if (updateMOFAttAdapter)
+ if (updateMOFAttAdapter && attrAdapter != null)
attrAdapter.updateMOF();
}
}
@@ -1543,9 +1608,9 @@
}
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating DOM Node: " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating DOM Node: " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
boolean notificationFlag = isNotificationEnabled();
try {
@@ -1574,9 +1639,9 @@
*/
final protected void updateDOMLinkFeature(Translator map, Node node, EObject mofObject) {
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating DOM Node (link): " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating DOM Node (link): " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
primUpdateDOMLinkFeature(map, node, mofObject);
}
@@ -1592,9 +1657,9 @@
*/
final protected void updateDOMMultiFeature(Translator map, Node node, EObject mofObject) {
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating DOM Node (multi): " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating DOM Node (multi): " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
boolean notificationFlag = isNotificationEnabled();
try {
@@ -1610,15 +1675,15 @@
* updated.
*/
protected void updateDOMSubtree(Translator map, Node node, EObject mofObject, Object attrValue) {
-
+ Object innerAttrValue = attrValue;
if (map.featureExists(mofObject)) {
if ((map.isEnumFeature() || map.isBooleanFeature()) && (map.isUnsettable() && !map.isSetMOFValue(mofObject)))
- attrValue = null;
+ innerAttrValue = null;
} else
- attrValue = map.extractStringValue(mofObject);
+ innerAttrValue = map.extractStringValue(mofObject);
// Create and/or update the DOM subtree
- if (attrValue != null) {
+ if (innerAttrValue != null) {
Node parent = createDOMPath(node, map);
if (map.isManagedByParent()) {
// Handle the case where the mof value is not another
@@ -1628,10 +1693,10 @@
Element child = map.isDOMTextValue() ? (Element) parent : findOrCreateNode(parent, map, map.getDOMName(mofObject));
- findOrCreateTextNode(child, map, map.convertValueToString(attrValue, mofObject));
+ findOrCreateTextNode(child, map, map.convertValueToString(innerAttrValue, mofObject));
} else {
// Handle the case were the mof value is a mof object.
- EObject mofValue = (EObject) attrValue;
+ EObject mofValue = (EObject) innerAttrValue;
EMF2DOMAdapter valueAdapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(mofValue, EMF2DOMAdapter.ADAPTER_CLASS);
if (valueAdapter != null)
valueAdapter.updateDOM();
@@ -1668,9 +1733,9 @@
*/
final protected void updateMOFLinkFeature(Translator map, Node node, EObject mofObject) {
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating MOFObject (link): " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating MOFObject (link): " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
boolean notificationFlag = isNotificationEnabled();
try {
@@ -1692,9 +1757,9 @@
*/
final protected void updateMOFMultiFeature(Translator map, Node node, EObject mofObject) {
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating MOFObject (multi): " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating MOFObject (multi): " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
boolean notificationFlag = isNotificationEnabled();
try {
@@ -1725,7 +1790,7 @@
if(map.getFeature() != null && map.getFeature().isUnique() && mofObject.eGet(map.getFeature()) != null && mofObject.eGet(map.getFeature()) instanceof List && ((List) mofObject.eGet(map.getFeature())).contains(attributeValue)){
advanceAddIndex = false;
String domName = map.domNameAndPath != null ? map.domNameAndPath : "attribute"; //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(new IllegalArgumentException("The 'no duplicates' constraint is violated by "+domName+" = "+attributeValue));
+ EcoreUtilitiesPlugin.logError(new IllegalArgumentException("The 'no duplicates' constraint is violated by "+domName+" = "+attributeValue)); //$NON-NLS-1$ //$NON-NLS-2$
handleInvalidMultiNodes(child.getNodeName());
} else {
map.setMOFValue(mofObject, attributeValue, addIndex);
@@ -1764,9 +1829,9 @@
// TODO MDE Add a map.isComment() and updateMOFCommentFeature(map, node, mofObject);
if (fDebug) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("Updating MOFObject: " + mofObject); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("Updating MOFObject: " + mofObject); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
}
boolean notificationFlag = isNotificationEnabled();
boolean hasChanged = false;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
index 53fbdc7..d07e3c4 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
@@ -28,7 +28,7 @@
import org.eclipse.emf.common.util.WrappedException;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.eclipse.wst.common.internal.emf.utilities.DOMLoadOptions;
import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
import org.eclipse.wst.common.internal.emf.utilities.Revisit;
@@ -39,7 +39,7 @@
-public class EMF2DOMRenderer extends AbstractRendererImpl implements Renderer {
+public class EMF2DOMRenderer extends AbstractRendererImpl {
protected Map domAdapterRegistry;
protected boolean needsToCreateDOM = true;
@@ -191,11 +191,11 @@
/* source.setSystemId(getResource().getSystemId()); */
transformer.transform(source, new StreamResult(out));
} catch (TransformerConfigurationException e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
} catch (TransformerFactoryConfigurationError e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
} catch (TransformerException e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
} finally {
}
}
@@ -241,6 +241,7 @@
}
}
+ @Override
public void preUnload() {
EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(resource.eAdapters(), EMF2DOMAdapter.ADAPTER_CLASS);
if (adapter != null) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
index fce5603..ff4fbbb 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
@@ -20,6 +20,7 @@
/**
* @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
*/
+ @Override
public Renderer createRenderer() {
EMF2DOMRenderer renderer = new EMF2DOMRenderer();
renderer.setValidating(isValidating());
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
index a25bb63..540c2af 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
@@ -13,7 +13,7 @@
import java.io.IOException;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -44,6 +44,7 @@
/**
* @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
*/
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
InputSource result = null;
this.resource.setDoctypeValues(publicId, systemId);
@@ -65,6 +66,7 @@
/**
* @see org.xml.sax.ContentHandler#startDocument()
*/
+ @Override
public void startDocument() throws SAXException {
/*
* The endDocument() method should have frozen the pool, or it may not be warmed yet. In
@@ -82,6 +84,7 @@
* @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String,
* java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
addToStack(qName, attributes);
}
@@ -89,6 +92,7 @@
/**
* @see org.xml.sax.ContentHandler#characters(char[], int, int)
*/
+ @Override
public void characters(char[] data, int start, int length) throws SAXException {
CacheEventNode currentRecord = getCurrentRecord();
@@ -101,6 +105,7 @@
* @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String,
* java.lang.String)
*/
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
CacheEventNode currentRecord = null;
@@ -120,6 +125,7 @@
/**
* @see org.xml.sax.ContentHandler#endDocument()
*/
+ @Override
public void endDocument() throws SAXException {
CacheEventNode lastRecord = this.removeCurrentRecord();
lastRecord.commit();
@@ -129,6 +135,7 @@
/**
* @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
*/
+ @Override
public void error(SAXParseException ex) throws SAXException {
throw ex;
}
@@ -136,6 +143,7 @@
/**
* @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
*/
+ @Override
public void fatalError(SAXParseException ex) throws SAXException {
throw ex;
}
@@ -143,8 +151,9 @@
/**
* @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
*/
+ @Override
public void warning(SAXParseException ex) throws SAXException {
- Logger.getLogger().logWarning(ex);
+ EcoreUtilitiesPlugin.logWarning(ex);
}
/**
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
index 86f721f..0913c14 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
@@ -15,6 +15,7 @@
import java.io.OutputStream;
import java.util.Map;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.OutputKeys;
@@ -27,7 +28,7 @@
import javax.xml.transform.stream.StreamResult;
import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
@@ -50,7 +51,7 @@
*
* @see com.ibm.etools.emf2xml.Renderer#doLoad(java.io.InputStream, java.util.Map)
*/
- public void doLoad(InputStream in, Map options) {
+ public void doLoad(InputStream in, Map options) throws IOException {
try {
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setValidating(isValidating());
@@ -65,21 +66,23 @@
try {
reader.setFeature("http://xml.org/sax/features/validation", isValidating()); //$NON-NLS-1$
} catch (SAXNotRecognizedException snre) {
+ // ignore exception
}
try {
reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); //$NON-NLS-1$
} catch (SAXNotRecognizedException snre) {
- }
+ // ignore exception
+ }
try {
reader.setFeature("http://apache.org/xml/features/validation/schema", isValidating()); //$NON-NLS-1$
} catch (SAXNotRecognizedException e) {
reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
}
try {
reader.setFeature("http://apache.org/xml/features/allow-java-encodings", true); //$NON-NLS-1$
} catch (SAXNotRecognizedException e) {
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
}
/*
* try { reader.setProperty("http://xml.org/sax/properties/lexical-handler", handler); }
@@ -93,9 +96,11 @@
reader.parse(testsource);
} catch (RuntimeException t_rex) {
throw t_rex;
- } catch (Exception ex) {
- throw new WrappedException(ex);
- }
+ } catch (SAXException se) {
+ throw new WrappedException(se);
+ } catch (ParserConfigurationException e) {
+ throw new WrappedException(e);
+ }
}
/*
@@ -133,12 +138,12 @@
transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, getResource().getSystemId());
} catch (TransformerConfigurationException e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
} catch (TransformerFactoryConfigurationError e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
}
if (handler == null) {
- Logger.getLogger("SAX Writer is null"); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("SAX Writer is null"); //$NON-NLS-1$
return;
}
EMF2SAXWriter writer = new EMF2SAXWriter();
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
index d3fd5d9..a2544d6 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
@@ -33,6 +33,7 @@
*
* @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
*/
+ @Override
public Renderer createRenderer() {
EMF2SAXRenderer renderer = new EMF2SAXRenderer();
renderer.setValidating(isValidating());
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
index 41b3dab..ff7b3a2 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
@@ -46,10 +46,12 @@
}
+ @Override
public synchronized Resource.Factory getFactory(URI uri) {
return getFactory(uri, null);
}
+ @Override
public Resource.Factory getFactory(URI uri, String contentType)
{
Resource.Factory resourceFactory = null;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
index eafe09f..c714f23 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
@@ -79,6 +79,7 @@
/**
* @return Translator[]
*/
+ @Override
public Translator[] getChildren() {
return children;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
index 64bf6a0..520f7f0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
@@ -25,6 +25,11 @@
public class IDTranslator extends Translator {
public class NoResourceException extends RuntimeException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8633201291288237530L;
+
public NoResourceException() {
super();
}
@@ -41,6 +46,7 @@
super("id", ID_FEATURE, DOM_ATTRIBUTE); //$NON-NLS-1$
}
+ @Override
public void setMOFValue(EObject emfObject, Object value) {
XMIResource res = (XMIResource) emfObject.eResource();
if (res == null)
@@ -52,6 +58,7 @@
res.setID(emfObject, (String) value);
}
+ @Override
public Object getMOFValue(EObject emfObject) {
if (emfObject == null)
throw new NoResourceException();
@@ -62,10 +69,12 @@
}
+ @Override
public boolean featureExists(EObject emfObject) {
return true;
}
+ @Override
public boolean isIDMap() {
return true;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
index f0939a2..f146af1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
@@ -57,6 +57,7 @@
}
+ @Override
public URI resolve(URI relative, URI base) {
URI resolved = null;
boolean isMapped = false;
@@ -87,6 +88,7 @@
return ((CompatibilityXMIResource) resource).getFormat() == CompatibilityXMIResource.FORMAT_MOF5 || usingMaps;
}
+ @Override
public void addPrefix(String prefix, String uri) {
/*
* problem - the incoming key value pair is ejbbnd->ejbbnd.xmi; however, the map already has
@@ -95,7 +97,7 @@
if (uri.endsWith(".ecore")) { //$NON-NLS-1$
usingMaps = false;
}
- String existing = (String) prefixesToURIs.get(prefix);
+ String existing = prefixesToURIs.get(prefix);
if (existing == null) {
prefixesToURIs.put(prefix, uri);
namespaceSupport.declarePrefix(prefix, uri);
@@ -112,6 +114,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getHREF(EObject)
*/
+ @Override
public String getHREF(EObject obj) {
if (!getCompatibilityResource().usesDefaultFormat()) {
URIConverter conv = getURIConverter();
@@ -158,13 +161,14 @@
}
protected URI makeRelative(URI objectURI, CompatibilityURIConverter conv) {
- String fragment = objectURI.fragment();
- objectURI = objectURI.trimFragment();
- URI relative = (URI) getCachedRelativeURIs().get(objectURI);
+ URI innerObjectURI = objectURI;
+ String fragment = innerObjectURI.fragment();
+ innerObjectURI = innerObjectURI.trimFragment();
+ URI relative = (URI) getCachedRelativeURIs().get(innerObjectURI);
if (relative == null) {
- relative = conv.deNormalize(objectURI);
+ relative = conv.deNormalize(innerObjectURI);
if (relative.isRelative())
- cachedRelativeURIs.put(objectURI, relative);
+ cachedRelativeURIs.put(innerObjectURI, relative);
}
return relative.appendFragment(fragment);
}
@@ -185,6 +189,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getID(EObject)
*/
+ @Override
public String getID(EObject obj) {
if (getCompatibilityResource().usesDefaultFormat())
return super.getID(obj);
@@ -230,6 +235,7 @@
this.packageURIsToPrefixes = packageURIsToPrefixes;
}
+ @Override
public String getQName(EClass c) {
String name = getName(c);
@@ -257,6 +263,7 @@
* @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#setValue(EObject, EStructuralFeature,
* Object, int)
*/
+ @Override
public void setValue(EObject object, EStructuralFeature feature, Object value, int position) {
if (feature == NULL_FEATURE)
return;
@@ -278,6 +285,7 @@
* @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeature(org.eclipse.emf.ecore.EClass,
* java.lang.String, java.lang.String, boolean)
*/
+ @Override
public EStructuralFeature getFeature(EClass eClass, String namespaceURI, String name, boolean isElement) {
if (UnsupportedFeature.isUnsupported(eClass, name))
return NULL_FEATURE;
@@ -289,6 +297,7 @@
*
* @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeatureKind(org.eclipse.emf.ecore.EStructuralFeature)
*/
+ @Override
public int getFeatureKind(EStructuralFeature feature) {
if (feature == NULL_FEATURE)
return XMLHelper.DATATYPE_SINGLE;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
index 91ed5bc..79226f6 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
@@ -45,6 +45,7 @@
* @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String,
* java.lang.String)
*/
+ @Override
public EObject createEMFObject(String nodeName, String readAheadName) {
return getDelegateFor(nodeName, readAheadName).createEMFObject(nodeName, readAheadName);
}
@@ -54,6 +55,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object)
*/
+ @Override
public Translator[] getChildren(Object o, int version) {
if (o == null)
return EMPTY_TRANSLATORS;
@@ -65,6 +67,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#getDOMName(java.lang.Object)
*/
+ @Override
public String getDOMName(Object value) {
return getDelegateFor((EObject) value).getDOMName(value);
}
@@ -75,10 +78,12 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#isManagedByParent()
*/
+ @Override
public boolean isManagedByParent() {
return false;
}
+ @Override
public boolean shouldIndentEndTag(Node node) {
if (node.getNodeName().equals(getDOMPath())) {
return super.shouldIndentEndTag(node);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
index 3c23ed4..ea4cc38 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
@@ -46,6 +46,7 @@
* @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
* java.lang.Object)
*/
+ @Override
public void setMOFValue(EObject emfObject, Object value) {
NamespaceAdapter.addNamespace(prefix, (String) value, emfObject);
}
@@ -55,6 +56,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public boolean isSetMOFValue(EObject emfObject) {
return getMOFValue(emfObject) != null;
}
@@ -64,6 +66,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public Object getMOFValue(EObject mofObject) {
return NamespaceAdapter.getNamespaceURIAtThisLevel(prefix, mofObject);
}
@@ -73,6 +76,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public void unSetMOFValue(EObject emfObject) {
NamespaceAdapter.removeNamespace(prefix, emfObject);
}
@@ -82,6 +86,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
*/
+ @Override
public boolean featureExists(EObject emfObject) {
return true;
}
@@ -91,6 +96,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
*/
+ @Override
public boolean isDataType() {
return true;
}
@@ -101,6 +107,7 @@
* @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
* java.lang.Object)
*/
+ @Override
public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
if (aFeature == feature) {
Namespace namespace = (Namespace) (oldValue == null ? newValue : oldValue);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
index 918b9ce..3e479f5 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
@@ -23,6 +23,7 @@
super(trans, version);
}
+ @Override
public final int scanNextTranslator(Translator[] children, int start) {
int found = start + 1;
for (; found < children.length; ++found) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
index 45faf2b..0a4818a 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
@@ -12,9 +12,8 @@
-import org.eclipse.emf.ecore.resource.Resource;
-public interface ReferencedResource extends Resource, CompatibilityXMIResource {
+public interface ReferencedResource extends CompatibilityXMIResource {
//TODO - rename packaged
public static final String DELETED_ERROR_MSG = "This resource has been deleted and can no longer be used."; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
index d891c2c..2a9fe76 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
@@ -42,6 +42,7 @@
/**
* @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl#createResource(URI)
*/
+ @Override
public final Resource createResource(URI uri) {
Resource res = doCreateResource(uri);
adaptNew(res);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
index 64b9a5c..33de28d 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
@@ -26,7 +26,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
public class ReferencedXMIResourceImpl extends CompatibilityXMIResourceImpl implements ReferencedResource {
@@ -43,57 +43,72 @@
public static class ESynchronizedAdapterList extends EAdapterList
{
- public ESynchronizedAdapterList(Notifier notifier) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7855438339187540718L;
+
+ public ESynchronizedAdapterList(Notifier notifier) {
super(notifier);
}
+ @Override
public synchronized boolean add(Object object)
{
return super.add(object);
}
- public synchronized void add(int index, Object object)
+ @Override
+ public synchronized void add(int index, Object object)
{
super.add(index, object);
}
- public synchronized boolean addAll(Collection collection)
+ @Override
+ public synchronized boolean addAll(Collection collection)
{
return super.addAll(collection);
}
- public synchronized boolean remove(Object object)
+ @Override
+ public synchronized boolean remove(Object object)
{
return super.remove(object);
}
- public synchronized Object remove(int index)
+ @Override
+ public synchronized Object remove(int index)
{
return super.remove(index);
}
- public synchronized boolean removeAll(Collection collection)
+ @Override
+ public synchronized boolean removeAll(Collection collection)
{
return super.removeAll(collection);
}
- public synchronized void clear()
+ @Override
+ public synchronized void clear()
{
super.clear();
}
- public synchronized Object set(int index, Object object)
+ @Override
+ public synchronized Object set(int index, Object object)
{
return super.set(index, object);
}
- public synchronized void move(int newPosition, Object object)
+ @Override
+ public synchronized void move(int newPosition, Object object)
{
super.move(newPosition, object);
}
- public synchronized Object move(int newPosition, int oldPosition)
+ @Override
+ public synchronized Object move(int newPosition, int oldPosition)
{
return super.move(newPosition, oldPosition);
}
@@ -272,6 +287,7 @@
save(Collections.EMPTY_MAP);
}
+ @Override
public String toString() {
return TO_STRING + getURI().toString() + READ_COUNT_TO_STRING + new Integer(readReferenceCount) + WRITE_COUNT_TO_STRING + new Integer(editReferenceCount);
}
@@ -298,6 +314,7 @@
return forceRefresh;
}
+ @Override
protected void basicDoLoad(InputStream arg0, Map arg1) throws IOException {
boolean isTrackingMods = isTrackingModification();
try {
@@ -313,6 +330,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
*/
+ @Override
protected void doUnload() {
try {
@@ -352,6 +370,7 @@
/**
* @see org.eclipse.emf.ecore.resource.Resource#save(Object)
*/
+ @Override
public void save(Map options) throws IOException {
notifyAboutToSave();
try {
@@ -360,8 +379,7 @@
notifySaveFailed();
if (e instanceof IOException)
throw (IOException) e;
- else
- Logger.getLogger().write(e);
+ EcoreUtilitiesPlugin.logError(e);
}
notifySaved();
}
@@ -383,11 +401,13 @@
Notification notification =
new NotificationImpl(eventType, this, this)
{
- public Object getNotifier()
+ @Override
+ public Object getNotifier()
{
return ReferencedXMIResourceImpl.this;
}
- public int getFeatureID(Class expectedClass)
+ @Override
+ public int getFeatureID(Class expectedClass)
{
return eventType;
}
@@ -403,6 +423,7 @@
return false;
}
+ @Override
public EList eAdapters()
{
if (eAdapters == null)
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
index 19c133c..356c05f 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
@@ -47,6 +47,7 @@
defaultRendererFactory = factory;
}
+ @Override
public String toString() {
return "RendererFactory instance: " + getClass().getName(); //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java
index 10850e9..697b516 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java
@@ -74,10 +74,12 @@
*/
public abstract Resource.Factory createFactory();
+ @Override
public int hashCode() {
return getShortSegment().hashCode();
}
+ @Override
public boolean equals(Object o) {
if(o instanceof ResourceFactoryDescriptor)
return getShortSegment().equals(((ResourceFactoryDescriptor)o).getShortSegment());
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
index f5640e9..bbba2f3 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
@@ -30,6 +30,7 @@
/**
* @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(Notifier, Object, int)
*/
+ @Override
public void setMOFValue(Notifier owner, Object value, int newIndex) {
((Resource) owner).getContents().add(newIndex, (EObject)value);
}
@@ -37,6 +38,7 @@
/**
* @see com.ibm.etools.emf2xml.impl.Translator#removeMOFValue(Notifier, Object)
*/
+ @Override
public void removeMOFValue(Notifier owner, Object value) {
((Resource) owner).getContents().remove(value);
}
@@ -47,6 +49,7 @@
* @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
* java.lang.Object)
*/
+ @Override
public void setMOFValue(Resource res, Object value) {
if (res != null && value != null)
res.getContents().add((EObject)value);
@@ -57,6 +60,7 @@
*
* @see com.ibm.etools.emf2xml.impl.Translator#isMultiValued()
*/
+ @Override
public boolean isMultiValued() {
return true;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
index d5d697b..371e0d8 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
@@ -51,6 +51,7 @@
super(domNameAndPath, aFeature, style);
}
+ @Override
public Object convertStringToValue(String strValue, EObject owner) {
Object value = null;
@@ -62,6 +63,7 @@
return value;
}
+ @Override
public String convertValueToString(Object value, EObject owner) {
TranslatorPath path = fTranslatorPaths[0];
Object attrValue = path.getLastMap().getMOFValue((EObject) value);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java
index 8caf4ea..e2f46fc 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java
@@ -34,6 +34,7 @@
this.factory = factory;
}
+ @Override
public boolean isEnabledFor(URI fileURI) {
/* shortSegment must be non-null for the descriptor to be created,
* a validation check in init() verifies this requirement */
@@ -42,10 +43,12 @@
return false;
}
+ @Override
public Resource.Factory createFactory() {
return factory;
}
+ @Override
public String getShortSegment() {
return shortSegment;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
index ab28074..0cee91f 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
@@ -380,6 +380,7 @@
return (String[]) results.toArray(new String[results.size()]);
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer();
String cn = getClass().getName();
@@ -410,12 +411,18 @@
/*
* @see Object#equals(Object)
*/
+ @Override
public boolean equals(Object object) {
if (!(object instanceof Translator))
return false;
Translator mapInfo = (Translator) object;
return fDOMNames.equals(mapInfo.getDOMNames()) && (feature == null && mapInfo.getFeature() == null || feature.equals(mapInfo.getFeature()));
}
+
+ @Override
+ public int hashCode() {
+ return super.hashCode() +fDOMNames.hashCode();
+ }
/**
* Returns the isManagedByParent.
@@ -510,20 +517,21 @@
public Object convertStringToValue(String strValue, EObject owner) {
if (feature == null)
return strValue;
- if (strValue != null) {
+ String innerStrValue = strValue;
+ if (innerStrValue != null) {
if (isEnumWithHyphens())
- strValue = strValue.replace('-', '_');
+ innerStrValue = innerStrValue.replace('-', '_');
if (!isCDATAContent()) {
- strValue = strValue.trim();
+ innerStrValue = innerStrValue.trim();
}
}
- Object value = FeatureValueConverter.DEFAULT.convertValue(strValue, feature);
+ Object value = FeatureValueConverter.DEFAULT.convertValue(innerStrValue, feature);
if (value == null) {
if (isEmptyTag() && !isDOMAttribute() && !isDOMTextValue() && isBooleanFeature())
return Boolean.TRUE;
EObject convertToType = feature.getEType();
if (convertToType == null)
- value = strValue;
+ value = innerStrValue;
else if (convertToType.equals(getEcorePackage().getEString())) {
value = ""; //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
index b12067d..a38b83b 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
@@ -104,6 +104,7 @@
* update the mode to VARIABLE_TRANSLATORS so we can skip to it directly next time
*/
this.mode = VARIABLE_TRANSLATORS_MODE;
+ //$FALL-THROUGH$
case VARIABLE_TRANSLATORS_MODE :
children = this.translator.getVariableChildren(target, this.version);
found = scanNextTranslator(children, this.index);
@@ -154,14 +155,15 @@
public static final Translator getNextChild(Translator translator, int startHint, int[] hints, EObject target, int version, TranslatorFilter translatorFilter) {
Translator result = null;
-
- int index = startHint;
+
+ int innerStartHint = startHint;
+ int index = innerStartHint;
Translator children[] = null;
switch (hints[MODE_HINT_INDX]) {
case STANDARD_TRANSLATORS_MODE :
children = translator.getChildren(target, version);
- if (children != null && startHint < children.length) {
+ if (children != null && innerStartHint < children.length) {
/* Look for the next Attribute Translator */
index = translatorFilter.scanNextTranslator(children, index);
@@ -179,17 +181,18 @@
* DO NOT BREAK we will default to VARIABLE TRANSLATORS MODE so we must reset
* the startHint appropriately
*/
- startHint = -1;
+ innerStartHint = -1;
}
+ //$FALL-THROUGH$
case VARIABLE_TRANSLATORS_MODE :
hints[MODE_HINT_INDX] = VARIABLE_TRANSLATORS_MODE;
/*
* Reset the index.
*/
- index = startHint;
+ index = innerStartHint;
children = translator.getVariableChildren(target, version);
- if (children != null && children.length > 0 && startHint < children.length) {
+ if (children != null && children.length > 0 && innerStartHint < children.length) {
index = translatorFilter.scanNextTranslator(children, index);
result = (index >= 0) ? children[index] : null;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
index a2d843e..6678b51 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
@@ -75,6 +75,7 @@
*
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer();
String cn = getClass().getName();
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
index 20a450b..9427fb7 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
@@ -48,6 +48,7 @@
return this.listeningForUpdates;
}
+ @Override
public Resource doCreateResource(URI uri) {
Renderer aRenderer = rendererFactory.createRenderer();
return createResource(uri, aRenderer);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
index 5d09434..78fbce0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
@@ -16,6 +16,7 @@
import java.util.Collection;
import java.util.Map;
+import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.NotificationImpl;
import org.eclipse.emf.common.util.EList;
@@ -26,7 +27,7 @@
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
import org.xml.sax.EntityResolver;
@@ -74,12 +75,14 @@
setRenderer(aRenderer);
}
+ @Override
public java.lang.String getEncoding() {
if (super.getEncoding() == null)
setEncoding(DEFAULT_ENCODING);
return super.getEncoding();
}
+ @Override
public String getPublicId() {
return publicId;
}
@@ -93,6 +96,7 @@
return (EObject) getContents().get(0);
}
+ @Override
public String getSystemId() {
return systemId;
}
@@ -103,10 +107,12 @@
systemId = aSystemId;
if (changed) {
eNotify(new NotificationImpl(Notification.SET, null, null) {
+ @Override
public Object getFeature() {
return DOC_TYPE_FEATURE;
}
+ @Override
public Object getNotifier() {
return TranslatorResourceImpl.this;
}
@@ -119,6 +125,7 @@
*
* @return String
*/
+ @Override
public String getXMLVersion() {
if (xmlVersion == null)
xmlVersion = DEFAULT_VERSION;
@@ -131,10 +138,12 @@
* @param xmlVersion
* The xmlVersion to set
*/
+ @Override
public void setXMLVersion(String xmlVersion) {
this.xmlVersion = xmlVersion;
}
+ @Override
protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
// long start = System.currentTimeMillis();
boolean isTrackingMods = isTrackingModification();
@@ -151,6 +160,7 @@
// recordTime("Load", start, end);
}
+ @Override
public void save(Map options) throws IOException {
if (renderer.useStreamsForIO()) {
super.save(options);
@@ -163,8 +173,7 @@
notifySaveFailed();
if (e instanceof IOException)
throw (IOException) e;
- else
- Logger.getLogger().write(e);
+ EcoreUtilitiesPlugin.logError(e);
}
notifySaved();
}
@@ -175,6 +184,7 @@
* @see com.ibm.etools.xmi.helpers.CompatibilityXMIResourceImpl#doSave(OutputStream,
* Map)
*/
+ @Override
public void doSave(OutputStream outputStream, Map options) throws IOException {
// long start = System.currentTimeMillis();
renderer.doSave(outputStream, options);
@@ -194,11 +204,13 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
*/
+ @Override
protected void doUnload() {
renderer.preUnload();
super.doUnload();
}
+ @Override
public String toString() {
return getClass().getName() + getURI().toString();
}
@@ -234,6 +246,7 @@
return super.getContents();
}
+ @Override
public EList getContents() {
waitForResourceToLoadIfNecessary();
if (contents == null) {
@@ -244,11 +257,18 @@
protected void initializeContents() {
contents = new ResourceImpl.ContentsEList() {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
public boolean add(Object object) {
renderer.prepareToAddContents();
return super.add(object);
}
+ @Override
public boolean addAll(Collection collection) {
renderer.prepareToAddContents();
return super.addAll(collection);
@@ -267,6 +287,7 @@
/**
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
*/
+ @Override
protected void init() {
super.init();
setEncoding(DEFAULT_ENCODING);
@@ -316,6 +337,7 @@
*
* @see org.eclipse.emf.ecore.xmi.XMLResource#setID(EObject, String)
*/
+ @Override
public void setID(EObject eObject, String id) {
String oldId = getID(eObject);
super.setID(eObject, id);
@@ -328,15 +350,20 @@
*
* @return boolean
*/
+ @Override
public boolean isModified() {
return super.isModified() || renderer.isModified();
}
+ public boolean isReverting() {
+ return ((AbstractRendererImpl)renderer).isReverting();
+ }
/*
* Overriden to give the renderer a hook
*
* @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForWrite()
*/
+ @Override
public void accessForWrite() {
renderer.accessForWrite();
super.accessForWrite();
@@ -347,16 +374,19 @@
*
* @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForRead()
*/
+ @Override
public void accessForRead() {
renderer.accessForRead();
super.accessForRead();
}
+ @Override
public void releaseFromRead() {
renderer.releaseFromRead();
super.releaseFromRead();
}
+ @Override
public void releaseFromWrite() {
renderer.releaseFromWrite();
super.releaseFromWrite();
@@ -367,19 +397,23 @@
*
* @see com.ibm.etools.emf.workbench.ReferencedXMIResourceImpl#preDelete()
*/
+ @Override
public void preDelete() {
super.preDelete();
renderer.preDelete();
}
+ @Override
public boolean isShared() {
return super.isShared() || renderer.isShared();
}
+ @Override
public boolean isSharedForWrite() {
return super.isSharedForWrite() || renderer.isSharedForWrite();
}
+ @Override
public void load(Map options) throws IOException {
if (isLoaded())
@@ -393,4 +427,18 @@
loadExisting(options);
}
}
+
+ @Override
+ public void eNotify(Notification notification) {
+ Adapter[] eAdapters = eBasicAdapterArray();
+ if (eAdapters != null && eDeliver())
+ {
+ for (int i = 0, size = eAdapters.length; i < size; ++i)
+ {
+ Adapter temp;
+ if ((temp = eAdapters[i]) != null)
+ temp.notifyChanged(notification);
+ }
+ }
+ }
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
index 43c5864..424241c 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
@@ -10,9 +10,6 @@
*******************************************************************************/
/*
* Created on Apr 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.eclipse.wst.common.internal.emf.resource;
@@ -21,9 +18,6 @@
/**
* @author cbridgha
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
*/
public class UnsupportedFeature extends EAttributeImpl {
/**
@@ -38,6 +32,5 @@
public UnsupportedFeature() {
super();
- // TODO Auto-generated constructor stub
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
index 3a44751..f6635a7 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.common.internal.emf.utilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
@@ -93,7 +93,7 @@
*/
public static void isNotNull(Object object, String message) {
if (object == null) {
- Logger.getLogger().logError("null_argument: " + message);//$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("null_argument: " + message);//$NON-NLS-1$
throw new AssertionFailedException();
}
}
@@ -123,7 +123,7 @@
*/
public static boolean isTrue(boolean expression, String message) {
if (!expression) {
- Logger.getLogger().logError("assertion failed: " + message);//$NON-NLS-1$
+ EcoreUtilitiesPlugin.logError("assertion failed: " + message);//$NON-NLS-1$
throw new AssertionFailedException();
}
return expression;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
index 044c60d..5de492e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
@@ -25,6 +25,11 @@
// on other packages and internal APIs.
class AssertionFailedException extends RuntimeException {
/**
+ *
+ */
+ private static final long serialVersionUID = 3408284008342683621L;
+
+ /**
* Constructs a new exception.
*/
public AssertionFailedException() {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
index e4eca5f..4d4225d 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
@@ -26,7 +26,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -494,18 +494,18 @@
try {
dbf.setAttribute("http://apache.org/xml/features/allow-java-encodings", new Boolean(options.isAllowJavaEncodings())); //$NON-NLS-1$
} catch (IllegalArgumentException ignore) {
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
}
try {
dbf.setAttribute("http://apache.org/xml/features/validation/schema", new Boolean(options.isValidate())); //$NON-NLS-1$
} catch (IllegalArgumentException ignore) {
dbf.setValidating(false);
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
}
try {
- dbf.setAttribute("http://apache.org/xml/features/dom/defer-node-expansion", Boolean.FALSE);
+ dbf.setAttribute("http://apache.org/xml/features/dom/defer-node-expansion", Boolean.FALSE); //$NON-NLS-1$
} catch (IllegalArgumentException ignore) {
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/dom/defer-node-expansion\"."); //$NON-NLS-1$
+ EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/dom/defer-node-expansion\"."); //$NON-NLS-1$
}
dbf.setExpandEntityReferences(options.isExpandEntityRefererences());
DocumentBuilder result = dbf.newDocumentBuilder();
@@ -529,7 +529,7 @@
}
public void warning(SAXParseException arg0) throws SAXException {
- Logger.getLogger().logWarning(arg0);
+ EcoreUtilitiesPlugin.logWarning(arg0);
}
});
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java
index debd006..9207710 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java
@@ -20,6 +20,11 @@
public class DanglingHREFException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3369128742899263327L;
+
public DanglingHREFException() {
super();
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
index ea56697..76e5962 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
@@ -348,7 +348,7 @@
* @aValue.
*/
protected Object failedToConvert(Object aValue, String aString) {
- String errorString = java.text.MessageFormat.format(FAILED_CONVERSION_PATTERN, new String[]{aValue.toString(), aString});
+ String errorString = java.text.MessageFormat.format(FAILED_CONVERSION_PATTERN, new Object[]{aValue.toString(), aString});
throw new FeatureValueConversionException(errorString);
}
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
index 927c0a4..456edb5 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
@@ -36,31 +36,31 @@
super();
}
+ @Override
public Resource.Factory getFactory(URI uri) {
return getFactory(uri, null);
}
+ @Override
public Resource.Factory getFactory(URI uri, String contentType)
{
Object resourceFactory = null;
+ String protocol = uri.scheme();
+ resourceFactory = protocolToFactoryMap.get(protocol);
if (resourceFactory == null) {
- String protocol = uri.scheme();
- resourceFactory = protocolToFactoryMap.get(protocol);
+ String extension = uri.fileExtension();
+ resourceFactory = extensionToFactoryMap.get(extension);
if (resourceFactory == null) {
- String extension = uri.fileExtension();
- resourceFactory = extensionToFactoryMap.get(extension);
- if (resourceFactory == null) {
- resourceFactory = delegatedGetFactory(uri);
- if (resourceFactory == GLOBAL_FACTORY) {
- resourceFactory = extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
- if (resourceFactory == null)
- resourceFactory = GLOBAL_FACTORY;
- }
-
+ resourceFactory = delegatedGetFactory(uri);
+ if (resourceFactory == GLOBAL_FACTORY) {
+ resourceFactory = extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
+ if (resourceFactory == null)
+ resourceFactory = GLOBAL_FACTORY;
}
+
}
}
-
+
return resourceFactory instanceof Resource.Factory.Descriptor ? ((Resource.Factory.Descriptor) resourceFactory).createFactory() : (Resource.Factory) resourceFactory;
}
@@ -69,6 +69,7 @@
*
* @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl#delegatedGetFactory(org.eclipse.emf.common.util.URI)
*/
+ @Override
protected Factory delegatedGetFactory(URI uri) {
return Resource.Factory.Registry.INSTANCE.getFactory(uri);
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java
index 0308041..1de9513 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java
@@ -46,6 +46,7 @@
*
* Copy Resources first and then copy RefObjects.
*/
+ @Override
public void copy(CopyGroup aGroup) {
if (aGroup != null) {
copyResources(aGroup);
@@ -60,6 +61,7 @@
* This method should be used if you are only going to copy <code>aRefObject</code> in this
* copy execution.
*/
+ @Override
public EObject copy(EObject aRefObject, String idSuffix) {
EObject copied = containmentCopy(aRefObject, idSuffix);
executeDeferredCopyActions();
@@ -70,6 +72,7 @@
* This method should be used if you are only going to copy <code>aRefObject</code> in this
* copy execution. This method only copies <code>aRefObject</code> attributes.
*/
+ @Override
public EObject copyObject(EObject aRefObject, String idSuffix) {
EObject copied = containmentCopyObject(aRefObject, idSuffix);
executeDeferredCopyActions();
@@ -80,6 +83,7 @@
* This method should be used if you are only going to copy <code>aResource</code> in this
* copy execution. The copied Resource will have a URI equal to <code>newUri</code>.
*/
+ @Override
public Resource copy(Resource aResource, String newUri) {
Resource copied = containmentCopy(aResource, newUri);
executeDeferredCopyActions();
@@ -103,6 +107,7 @@
* @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#primCopyObject(EObject,
* String)
*/
+ @Override
protected EObject primCopyObject(EObject aRefObject, String idSuffix) {
EObject copy = super.primCopyObject(aRefObject, idSuffix);
copyIdIfNecessary(aRefObject, copy, idSuffix);
@@ -140,6 +145,7 @@
/**
* Return a cached copy.
*/
+ @Override
public EObject getCopy(EObject anObject) {
EObject copied = super.getCopy(anObject);
if (copied == null)
@@ -159,6 +165,7 @@
/**
* Return an instance of EObject that is the same type as <code>aRefObject</code>.
*/
+ @Override
public EObject newInstance(EObject aRefObject) {
EObject newType = super.newInstance(aRefObject);
newType.eSetDeliver(false);
@@ -168,6 +175,7 @@
/**
* @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#newInstance(Resource, String)
*/
+ @Override
public Resource newInstance(Resource aResource, String newUri) {
Resource copy = super.newInstance(aResource, newUri);
if (aResource instanceof XMLResource) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java
index 22d91e0..a89a7c7 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java
@@ -51,6 +51,7 @@
super(aReference, aValue, aSuffix, aCopyContainer);
}
+ @Override
public void performAction() {
EObject value = (EObject) getReferenceValue();
getCopyContainer().eSet(getReference(), getCopyIfFound(value));
@@ -62,6 +63,7 @@
super(aReference, aValue, aSuffix, aCopyContainer);
}
+ @Override
public void performAction() {
List copyList = (List) getCopyContainer().eGet(getReference());
Iterator it = ((List) getReferenceValue()).iterator();
@@ -529,9 +531,10 @@
public Resource newInstance(Resource aResource, String newUri) {
if (aResource == null)
return null;
+ String innerNewUri = newUri;
Resource newResource;
String originalUri = aResource.getURI().toString();
- newUri = newUri == null ? originalUri : newUri;
+ innerNewUri = innerNewUri == null ? originalUri : innerNewUri;
Resource.Factory factory = null;
if (aResource.getResourceSet() == null)
@@ -540,7 +543,7 @@
factory = aResource.getResourceSet().getResourceFactoryRegistry().getFactory(URI.createURI(originalUri));
- newResource = factory.createResource(URI.createURI(newUri));
+ newResource = factory.createResource(URI.createURI(innerNewUri));
return newResource;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
index e9cf914..823f191 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
@@ -11,10 +11,12 @@
package org.eclipse.wst.common.internal.emf.utilities;
import java.io.FileNotFoundException;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EAdapterList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException;
@@ -34,7 +36,80 @@
private static FileNotFoundDetector FILE_NOT_FOUND_DETECTOR;
private static String NAME_ATTRIBUTE_STRING = "name"; //$NON-NLS-1$
+ public static class ESynchronizedAdapterList extends EAdapterList
+ {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7855438339187540718L;
+
+ public ESynchronizedAdapterList(Notifier notifier) {
+ super(notifier);
+ }
+
+ @Override
+ public synchronized boolean add(Object object)
+ {
+ return super.add(object);
+ }
+
+ @Override
+ public synchronized void add(int index, Object object)
+ {
+ super.add(index, object);
+ }
+
+ @Override
+ public synchronized boolean addAll(Collection collection)
+ {
+ return super.addAll(collection);
+ }
+
+ @Override
+ public synchronized boolean remove(Object object)
+ {
+ return super.remove(object);
+ }
+
+ @Override
+ public synchronized Object remove(int index)
+ {
+ return super.remove(index);
+ }
+
+ @Override
+ public synchronized boolean removeAll(Collection collection)
+ {
+ return super.removeAll(collection);
+ }
+
+ @Override
+ public synchronized void clear()
+ {
+ super.clear();
+ }
+
+
+ @Override
+ public synchronized Object set(int index, Object object)
+ {
+ return super.set(index, object);
+ }
+
+ @Override
+ public synchronized void move(int newPosition, Object object)
+ {
+ super.move(newPosition, object);
+ }
+
+ @Override
+ public synchronized Object move(int newPosition, int oldPosition)
+ {
+ return super.move(newPosition, oldPosition);
+ }
+ }
+
public interface FileNotFoundDetector {
boolean isFileNotFound(WrappedException wrappedEx);
}
@@ -71,10 +146,11 @@
public static void eSetOrAdd(EObject obj, EStructuralFeature feature, Object value, int newIndex) {
if (feature.isMany() && value != null) {
- if (newIndex >= 0)
- ((List) obj.eGet(feature)).add(newIndex, value);
+ List featureList = ((List) obj.eGet(feature));
+ if (newIndex >= 0 && newIndex < featureList.size())
+ featureList.add(newIndex, value);
else
- ((List) obj.eGet(feature)).add(value);
+ featureList.add(value);
} else {
obj.eSet(feature, value);
}
@@ -194,7 +270,7 @@
Resource res = root.eResource();
EObject container = root.eContainer();
/* Making sure the proxy is created first before unloading */
- if (root != null && res != null)
+ if (res != null)
becomeProxy(root, res);
if (container == null)
if (res != null)
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
index 0525a1f..38c24d1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
@@ -11,6 +11,11 @@
public class FeatureValueConversionException extends RuntimeException {
/**
+ *
+ */
+ private static final long serialVersionUID = 8190891648333814201L;
+
+ /**
* Constructor for FeatureValueConversionException.
*/
public FeatureValueConversionException() {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java
new file mode 100644
index 0000000..2fb3c95
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * 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.internal.emf.utilities;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+
+public interface ICommand2 extends ICommand {
+
+ /**
+ * Accessor for a {@link List} of {@link IProject} that were modified by the execution of this command.
+ *
+ * @return A {@link List} of {@link IProject} that were modified by the execution of this command.
+ */
+ public List getAffectedProjects();
+}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java
index 388986c..2aa022c 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java
@@ -52,14 +52,15 @@
}
protected static String ensureUniqueID(XMLResource aResource, String baseIDName) {
- baseIDName += "_"; //$NON-NLS-1$
+ String innerBaseIDName = baseIDName;
+ innerBaseIDName += "_"; //$NON-NLS-1$
//Change to use the current time instead of incremental numbers to help
//support team development.
long currentTime = System.currentTimeMillis();
- String id = baseIDName + currentTime;
+ String id = innerBaseIDName + currentTime;
while (aResource.getEObject(id) != null) {
++currentTime;
- id = baseIDName + currentTime;
+ id = innerBaseIDName + currentTime;
}
return id;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
index 5ff513b..18b8d14 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
@@ -12,5 +12,10 @@
import org.omg.CORBA.UserException;
public class InvalidPasswordCipherException extends UserException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1878574401021590545L;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
index 2e16808..161c069 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
@@ -12,5 +12,10 @@
import org.omg.CORBA.UserException;
public class InvalidPasswordDecodingException extends UserException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6211942853796823840L;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
index dd882d7..a03e653 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
@@ -12,5 +12,10 @@
import org.omg.CORBA.UserException;
public class InvalidPasswordEncodingException extends UserException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1320759752706898095L;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
index a75b865..b52fe8a 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
@@ -43,6 +43,7 @@
*
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
+ @Override
public void notifyChanged(Notification msg) {
if (resource != null) {
//listen for the remove of the loading adapter
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java
index 0bdac76..78892fa 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java
@@ -57,6 +57,7 @@
*
* @see org.eclipse.emf.common.notify.impl.NotificationImpl#getFeature()
*/
+ @Override
public Object getFeature() {
return NOTIFICATION_FEATURE;
}
@@ -169,6 +170,7 @@
*
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
*/
+ @Override
public boolean isAdapterForType(Object type) {
return ADAPTER_TYPE.equals(type);
}
@@ -191,6 +193,7 @@
*
* @see com.ibm.etools.emf.ecore.utilities.CloneablePublic#clone()
*/
+ @Override
public Object clone() {
NamespaceAdapter result = new NamespaceAdapter();
if (hasNamespaces()) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
index e684059..d8677eb 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
@@ -14,7 +14,7 @@
/**
* A passthru EncoderDecoder implementation
*/
-public class PassthruEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
+public class PassthruEncoderDecoder extends EncoderDecoderAdapter {
public static final PassthruEncoderDecoder INSTANCE = new PassthruEncoderDecoder();
public static final String KEY = PassthruEncoderDecoder.class.getName();
@@ -28,6 +28,7 @@
/**
* Returns a decoded version of the value.
*/
+ @Override
public String decode(String value) {
return value;
}
@@ -35,6 +36,7 @@
/**
* Returns an encoded version of the value.
*/
+ @Override
public String encode(String value) {
return value;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
index 2c82ced..1334efb 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
@@ -8,16 +8,18 @@
**************************************************************************************************/
package org.eclipse.wst.common.internal.emf.utilities;
-public class PasswordEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
+public class PasswordEncoderDecoder extends EncoderDecoderAdapter {
public static final String KEY = "password-security-coder"; //$NON-NLS-1$
public PasswordEncoderDecoder() {
}
+ @Override
public String decode(String s) {
return PasswordUtil.passwordDecode(s);
}
+ @Override
public String encode(String s) {
return PasswordUtil.passwordEncode(s);
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
index 012f2c2..a46a97c 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
@@ -60,15 +60,16 @@
public static String getCryptoAlgorithm(String s) {
String s1 = null;
- if (s != null) {
- s = s.trim();
- if (s.length() >= 2) {
- int i = s.indexOf("{"); //$NON-NLS-1$
+ String innerS = s;
+ if (innerS != null) {
+ innerS = innerS.trim();
+ if (innerS.length() >= 2) {
+ int i = innerS.indexOf("{"); //$NON-NLS-1$
if (i == 0) {
- int j = s.indexOf("}", ++i); //$NON-NLS-1$
+ int j = innerS.indexOf("}", ++i); //$NON-NLS-1$
if (j > 0)
if (i < j)
- s1 = s.substring(i, j).trim();
+ s1 = innerS.substring(i, j).trim();
else
s1 = EMPTY_STRING;
}
@@ -91,12 +92,13 @@
}
public static boolean isValidCryptoAlgorithm(String s) {
- if (s != null) {
- s = s.trim();
- if (s.length() == 0)
+ String innerS = s;
+ if (innerS != null) {
+ innerS = innerS.trim();
+ if (innerS.length() == 0)
return true;
for (int i = 0; i < SUPPORTED_CRYPTO_ALGORITHMS.length; i++)
- if (s.equalsIgnoreCase(SUPPORTED_CRYPTO_ALGORITHMS[i]))
+ if (innerS.equalsIgnoreCase(SUPPORTED_CRYPTO_ALGORITHMS[i]))
return true;
}
return false;
@@ -137,15 +139,16 @@
public static String removeCryptoAlgorithmTag(String s) {
String s1 = null;
- if (s != null) {
- s = s.trim();
- if (s.length() >= 2) {
- int i = s.indexOf("{"); //$NON-NLS-1$
+ String innerS = s;
+ if (innerS != null) {
+ innerS = innerS.trim();
+ if (innerS.length() >= 2) {
+ int i = innerS.indexOf("{"); //$NON-NLS-1$
if (i == 0) {
- int j = s.indexOf("}", ++i); //$NON-NLS-1$
+ int j = innerS.indexOf("}", ++i); //$NON-NLS-1$
if (j > 0)
- if (++j < s.length())
- s1 = s.substring(j).trim();
+ if (++j < innerS.length())
+ s1 = innerS.substring(j).trim();
else
s1 = EMPTY_STRING;
}
@@ -163,7 +166,7 @@
try {
abyte0 = s.getBytes(STRING_CONVERSION_CODE);
} catch (UnsupportedEncodingException unsupportedencodingexception) {
- abyte0 = null;
+ //do nothing
}
return abyte0;
}
@@ -177,7 +180,7 @@
try {
s = new String(abyte0, STRING_CONVERSION_CODE);
} catch (UnsupportedEncodingException unsupportedencodingexception) {
- s = null;
+ //do nothing
}
return s;
}
@@ -198,7 +201,9 @@
private static byte[] base64Decode(byte abyte0[]) {
int i;
- for (i = abyte0.length; abyte0[--i] == 61;);
+ for (i = abyte0.length; abyte0[--i] == 61;){
+ //do nothing just finding index of 61
+ }
byte abyte1[] = new byte[(i + 1) - abyte0.length / 4];
for (int j = 0; j < abyte0.length; j++)
abyte0[j] = BASE64_DECODE_MAP[abyte0[j]];
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
index 5a548d6..bd4776e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
@@ -18,6 +18,11 @@
*/
public class PleaseMigrateYourCodeError extends Error {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1137010999400298839L;
+
//TODO Delete me
public PleaseMigrateYourCodeError() {
super(WFTUtilsResourceHandler.PleaseMigrateYourCodeError_ERROR_0);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
index 34ff643..79c8046 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
@@ -38,6 +38,7 @@
*
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
*/
+ @Override
public boolean isAdapterForType(Object type) {
return RESOURCE_DEPENDENCY_TYPE.equals(type);
}
@@ -47,6 +48,7 @@
*
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
+ @Override
public void notifyChanged(Notification msg) {
//Listen for unloads and removes
switch (msg.getFeatureID(null)) {
@@ -75,6 +77,7 @@
*
* @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
+ @Override
public void notifyChanged(Notification msg) {
if (msg.getEventType() == Notification.ADD)
proccessAddedResource((ResourceSet) msg.getNotifier(), (Resource) msg.getNewValue());
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java
index d36ea59..a5d96ea 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java
@@ -10,22 +10,20 @@
*******************************************************************************/
/*
* Created on Oct 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
package org.eclipse.wst.common.internal.emf.utilities;
+import java.util.List;
+
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
/**
* @author mdelder
*/
-public class ResourceIsLoadingAdapter extends AdapterImpl implements Adapter {
+public class ResourceIsLoadingAdapter extends AdapterImpl {
private static final Class RESOURCE_IS_LOADING_ADAPTER_CLASS = ResourceIsLoadingAdapter.class;
@@ -43,7 +41,7 @@
* synchronization.
*/
synchronized(aResource.eAdapters()) {
- adapter = (ResourceIsLoadingAdapter) EcoreUtil.getAdapter(aResource.eAdapters(), ResourceIsLoadingAdapter.class);
+ adapter = (ResourceIsLoadingAdapter) getAdapter(aResource.eAdapters(), ResourceIsLoadingAdapter.class);
}
return adapter;
@@ -54,7 +52,8 @@
*
* @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
- public void notifyChanged(Notification notification) {
+ @Override
+ public void notifyChanged(Notification notification) {
if (notification.getNotifier() != null) {
@@ -69,6 +68,18 @@
public void waitForResourceToLoad() {
}
+ public static Adapter getAdapter(List<Adapter> adapters, Object type)
+ {
+ for (int i = 0, size = adapters.size(); i < size; ++i)
+ {
+ Adapter adapter = adapters.get(i);
+ if (adapter != null && adapter.isAdapterForType(type))
+ {
+ return adapter;
+ }
+ }
+ return null;
+ }
/**
* @param notification
@@ -100,7 +111,8 @@
*
* @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
*/
- public boolean isAdapterForType(Object type) {
+ @Override
+ public boolean isAdapterForType(Object type) {
return type == RESOURCE_IS_LOADING_ADAPTER_CLASS;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java
index 5899f5d..6e30496 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java
@@ -10,9 +10,6 @@
*******************************************************************************/
/*
* Created on Oct 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
package org.eclipse.wst.common.internal.emf.utilities;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
index 79ee8b8..975db26 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
@@ -16,8 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.wst.common.core.util.RegistryReader;
import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -77,6 +76,7 @@
/**
* Add the configuration element if it matchs the expected translator element name
*/
+ @Override
public boolean readElement(IConfigurationElement element) {
boolean result = false;
if (TRANSLATOR.equals(element.getName())) {
@@ -134,7 +134,7 @@
try {
instance = (Translator) configElement.createExecutableExtension(CLASSNAME);
} catch (CoreException e) {
- Logger.getLogger().logError(e);
+ EcoreUtilitiesPlugin.logError(e);
}
return instance;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
index f71c66d..58459bf 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
@@ -12,5 +12,10 @@
import org.omg.CORBA.UserException;
public class UnsupportedCryptoAlgorithmException extends UserException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3510453767624155991L;
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
index d9a1d2c..7503523 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
@@ -14,7 +14,7 @@
/**
* An XML value escaping EncoderDecoder implementation
*/
-public class XMLValueEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
+public class XMLValueEncoderDecoder extends EncoderDecoderAdapter {
/**
* Identifies the last printable character in the Unicode range that is supported by the
* encoding used with this serializer. For 8-bit encodings this will be either 0x7E or 0xFF. For
@@ -34,6 +34,7 @@
/**
* Returns a decoded version of the value.
*/
+ @Override
public String decode(String value) {
// NOT_IMPLEMENTED
return value;
@@ -47,6 +48,7 @@
* @param source
* The string to escape
*/
+ @Override
public String encode(String value) {
StringBuffer sbuf = new StringBuffer(value.length());
String charRef = null;
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/.classpath b/plugins/org.eclipse.wst.common.emfworkbench.integration/.classpath
deleted file mode 100644
index fe45152..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="property_file"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/jem/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/.cvsignore b/plugins/org.eclipse.wst.common.emfworkbench.integration/.cvsignore
deleted file mode 100644
index 47e4670..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-emfworkbenchedit.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/.project b/plugins/org.eclipse.wst.common.emfworkbench.integration/.project
deleted file mode 100644
index afef01a..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.emfworkbench.integration</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.emfworkbench.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
deleted file mode 100644
index 6afb47c..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.emfworkbench.integration; singleton:=true
-Bundle-Version: 1.1.202.qualifier
-Bundle-Activator: org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.internal.emfworkbench;x-internal:=true,
- org.eclipse.wst.common.internal.emfworkbench.edit;x-internal:=true,
- org.eclipse.wst.common.internal.emfworkbench.integration;x-internal:=true,
- org.eclipse.wst.common.internal.emfworkbench.validateedit;x-internal:=true
-Require-Bundle: org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,
- J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties
deleted file mode 100644
index cdc1ce7..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-EMF_Resource_Edit_Model=EMF Resource Edit Model
-Edit_Model_Extensions=Edit Model Extensions
-Adapter_Factory_Extension=Adapter Factory Extension
-ModifierHelperFactory=ModifierHelperFactory
-pluginName=EMF Workbench Edit Plug-in
-pluginVendor=Eclipse.org
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.xml b/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.xml
deleted file mode 100644
index 5673b57..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/plugin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="editModel" name="%EMF_Resource_Edit_Model" schema="schema/editModel.exsd"/>
- <extension-point id="editModelExtension" name="%Edit_Model_Extensions" schema="schema/editModelExtension.exsd"/>
- <extension-point id="adapterFactory" name="%Adapter_Factory_Extension" schema="schema/adapterFactory.exsd"/>
- <extension-point id="ModifierHelperFactory" name="%ModifierHelperFactory" schema="schema/modifierHelperFactory.exsd"/>
-
- <extension
- point="org.eclipse.jem.util.internalWorkbenchContextFactory">
- <factoryClass
- name="org.eclipse.wst.common.internal.emfworkbench.edit.EMFWorkbenchEditContextFactory">
- </factoryClass>
- </extension>
-
- <extension
- id="emfValidationHandler"
- name="emfValidationHandler"
- point="org.eclipse.wst.validation.validationSelectionHandler">
- <validationSelectionHandler
- id="emfValidationHandler"
- handlerClass="org.eclipse.wst.common.internal.emfworkbench.EmfValidationHandler"
- selectionType="org.eclipse.emf.ecore.EObject"/>
- </extension>
-
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- id="org.eclipse.wst.common.internal.emfworkbench.EmfPackagePropertyTester"
- type="org.eclipse.emf.ecore.EObject"
- namespace="org.eclipse.wst.common.emfworkbench.integration"
- properties="emfPackage"
- class="org.eclipse.wst.common.internal.emfworkbench.EmfPackagePropertyTester">
- </propertyTester>
- </extension>
-
- <extension
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="ValidateEditContext"
- className="org.eclipse.wst.common.internal.emfworkbench.validateedit.ValidateEditHeadlessContext"
- context="Headless">
- </uiContextSensitiveClass>
- </extension>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/prepareforpii.xml b/plugins/org.eclipse.wst.common.emfworkbench.integration/prepareforpii.xml
deleted file mode 100644
index 26d1d46..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/prepareforpii.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.emf.workbench.edit"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_file" >
- <fileset dir="${plugindir}/property_file">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties
deleted file mode 100644
index 77d84df..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emftosed.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Unexpected_IO_exception_occurred_creating_xml_document_1_EXC_=IWAE0017E Unexpected IO exception occurred creating xml document
-EMF2DOMSedRenderer_UI_0={0} should not use an OutputStream for loading
-EMF2DOMSedRenderer_UI_1={0} should not use an InputStream for loading
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties
deleted file mode 100644
index 631d1c3..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/property_file/emfworkbenchedit.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-DynamicAdapterFactory_ERROR_0=IWAE0010E A null EPackage will not be tied to any Adapter Factory.
-ClientAccessRegistryException_UI_0=There are at least {0} improperly released edit models.
-ClientAccessRegistryException_UI_1=This exception was generated to indicate an invalid usage of reference counts.\n Typically, this occurs on attempts to open an already open artifact edit.\n Make sure the dispose method is called when done accessing.\n Please examine the stack trace.\n Client Access Exception of type {0} \n
-ClientAccessRegistry_ERROR_0=IWAE0011E Key already used to access Resource
-ClientAccessRegistry_ERROR_1=IWAE0012E Key has not properly accessed Resource.
-EditModelRegistry_ERROR_0=IWAE0013E The inheritance hierarchy for the Edit Model \"{0}\" contains a cycle. Please correct the entries in your plugin.xml files.
-EditModelRegistry_ERROR_1=IWAE0014E Could not create factory because IConfigurationElement is null.
-EditModelRegistry_ERROR_2=IWAE0015E No EditModelFactory for key \"{0}\"
-Snapshot_ERROR_0=IWAE0016E Locking Insurance Stack Trace
-AdapterFactoryDescriptor_ERROR_0=IWAE0017E A packageURI is required for all Adapter Factories
-AdapterFactoryDescriptor_ERROR_1=IWAE0018E An id is required for all Adapter Factories. Check all adapter factories defined in \"{0}\".
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/ModuleCore.genmodel b/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/ModuleCore.genmodel
deleted file mode 100644
index 5d6bddd..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/ModuleCore.genmodel
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.common.emfworkbench.integration/src"
- editDirectory="/org.eclipse.wst.common.emfworkbench.integration.edit/src" editorDirectory="/org.eclipse.wst.common.emfworkbench.integration.editor/src"
- modelPluginID="org.eclipse.wst.common.emfworkbench.integration" runtimeJar="true"
- modelName="ProjectModule" editPluginClass="org.eclipse.wst.projectmodule.provider.ModuleCoreEditPlugin"
- editorPluginClass="org.eclipse.wst.projectmodule.presentation.ModuleCoreEditorPlugin"
- runtimeCompatibility="false">
- <foreignModel>moduleCore.mdl</foreignModel>
- <foreignModel>WORKSPACE_ROOT</foreignModel>
- <foreignModel>D:\work\WTP</foreignModel>
- <genPackages prefix="ModuleCore" basePackage="org.eclipse.wst.common" disposableProviderFactory="true"
- ecorePackage="moduleCore.ecore#/">
- <genEnums ecoreEnum="moduleCore.ecore#//DependencyType">
- <genEnumLiterals ecoreEnumLiteral="moduleCore.ecore#//DependencyType/uses"/>
- <genEnumLiterals ecoreEnumLiteral="moduleCore.ecore#//DependencyType/consumes"/>
- </genEnums>
- <genDataTypes ecoreDataType="moduleCore.ecore#//URI"/>
- <genClasses ecoreClass="moduleCore.ecore#//WorkbenchModule">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute moduleCore.ecore#//WorkbenchModule/handle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//WorkbenchModule/deployedName"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference moduleCore.ecore#//WorkbenchModule/resources"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference moduleCore.ecore#//WorkbenchModule/moduleType"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference moduleCore.ecore#//WorkbenchModule/modules"/>
- </genClasses>
- <genClasses ecoreClass="moduleCore.ecore#//WorkbenchModuleResource">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//WorkbenchModuleResource/sourcePath"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//WorkbenchModuleResource/deployedPath"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//WorkbenchModuleResource/exclusions"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference moduleCore.ecore#//WorkbenchModuleResource/module"/>
- </genClasses>
- <genClasses ecoreClass="moduleCore.ecore#//ModuleType">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//ModuleType/metadataResources"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//ModuleType/moduleTypeId"/>
- </genClasses>
- <genClasses ecoreClass="moduleCore.ecore#//ProjectModules">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//ProjectModules/projectName"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference moduleCore.ecore#//ProjectModules/workbenchModules"/>
- </genClasses>
- <genClasses ecoreClass="moduleCore.ecore#//DependentModule">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//DependentModule/handle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//DependentModule/deployedPath"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute moduleCore.ecore#//DependentModule/dependencyType"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.cat b/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.cat
deleted file mode 100644
index 330f5b8..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.cat
+++ /dev/null
@@ -1,1065 +0,0 @@
-
-(object Petal
- version 50
- _written "Rose 8.3.0407.2800"
- charSet 0)
-
-(object Class_Category "moduleCore"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value (value Text "org.eclipse.wst.common"))
- (object Attribute
- tool "Ecore"
- name "prefix"
- value (value Text "ModuleCore"))
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value (value Text "modulecore.xmi")))
- quid "3A0DB68B0046"
- visible_categories (list visibility_relationship_list
- (object Visibility_Relationship
- quid "3F2E8236025A"
- supplier "Logical View::ejbext"
- quidu "39AA86660190")
- (object Visibility_Relationship
- quid "3F2E8236025B"
- supplier "Logical View::webappext"
- quidu "39B534FD024C")
- (object Visibility_Relationship
- quid "3F2E8236025C"
- supplier "Logical View::ejbbnd"
- quidu "39B960FC03CA")
- (object Visibility_Relationship
- quid "3F2E82360264"
- supplier "Logical View::webappbnd"
- quidu "39B961060107")
- (object Visibility_Relationship
- quid "3F2E82360265"
- supplier "Logical View::clientbnd"
- quidu "39B9614F031F")
- (object Visibility_Relationship
- quid "3F2E82360266"
- supplier "Logical View::applicationext"
- quidu "3A22E6080303")
- (object Visibility_Relationship
- quid "3F2E82360267"
- supplier "Logical View::applicationbnd"
- quidu "39B9611502A4")
- (object Visibility_Relationship
- quid "3F2E82360268"
- supplier "Logical View::j2cbnd"
- quidu "39B9632E038C"))
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "WorkbenchModule"
- quid "41E3DF5801FA"
- class_attributes (list class_attribute_list
- (object ClassAttribute "handle"
- quid "41EC1D71015D"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "deployedName"
- quid "4201471D0208"
- type "String"
- exportControl "Public")))
- (object Class "WorkbenchModuleResource"
- quid "41E3DF670039"
- class_attributes (list class_attribute_list
- (object ClassAttribute "sourcePath"
- quid "41E3DF970128"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "deployedPath"
- quid "41EEC640025B"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "exclusions"
- quid "41E3DF9E011E"
- stereotype "0..*"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")))
- (object Class "ModuleType"
- quid "41EC1D5103E2"
- class_attributes (list class_attribute_list
- (object ClassAttribute "metadataResources"
- quid "41EC1DF0021E"
- stereotype "0..*"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "moduleTypeId"
- quid "41EC21340357"
- type "String"
- exportControl "Public")))
- (object Class "URI"
- quid "41EC26DA027A"
- stereotype "datatype"
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.emf.common.util.URI"
- quid "41EC270803AC"
- stereotype "javaclass"
- exportControl "Public")))
- (object Class "ProjectModules"
- quid "41F566DB0251"
- class_attributes (list class_attribute_list
- (object ClassAttribute "projectName"
- quid "41F567FD023A"
- type "String"
- exportControl "Public")))
- (object Class "DependentModule"
- quid "41F6C24B023D"
- class_attributes (list class_attribute_list
- (object ClassAttribute "handle"
- quid "420145F001C9"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "deployedPath"
- quid "420145FA0015"
- type "URI"
- quidu "41EC26DA027A"
- exportControl "Public")
- (object ClassAttribute "dependencyType"
- quid "42039243016E"
- type "DependencyType"
- quidu "420394F50185"
- exportControl "Public")))
- (object Class "DependencyType"
- quid "420394F50185"
- documentation
-|uses=0
-|consumes=1
-
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "uses"
- quid "42039938018D"
- exportControl "Public")
- (object ClassAttribute "consumes"
- quid "42039A6E0139"
- exportControl "Public")))
- (object Association "$UNNAMED$0"
- quid "41E3E14B01E3"
- roles (list role_list
- (object Role "resources"
- quid "41E3E14D031D"
- label "resources"
- supplier "Logical View::moduleCore::WorkbenchModuleResource"
- quidu "41E3DF670039"
- client_cardinality (value cardinality "0..*")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "module"
- quid "41E3E14D031F"
- label "module"
- supplier "Logical View::moduleCore::WorkbenchModule"
- quidu "41E3DF5801FA"
- client_cardinality (value cardinality "1")
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$1"
- quid "41EC1D9802C2"
- roles (list role_list
- (object Role "moduleType"
- quid "41EC1D990241"
- label "moduleType"
- supplier "Logical View::moduleCore::ModuleType"
- quidu "41EC1D5103E2"
- client_cardinality (value cardinality "1")
- is_navigable TRUE)
- (object Role "$UNNAMED$2"
- quid "41EC1D990243"
- supplier "Logical View::moduleCore::WorkbenchModule"
- quidu "41E3DF5801FA")))
- (object Association "$UNNAMED$3"
- quid "41F5672000E8"
- roles (list role_list
- (object Role "workbenchModules"
- quid "41F567210111"
- label "workbenchModules"
- supplier "Logical View::moduleCore::WorkbenchModule"
- quidu "41E3DF5801FA"
- client_cardinality (value cardinality "0..*")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$4"
- quid "41F567210113"
- supplier "Logical View::moduleCore::ProjectModules"
- quidu "41F566DB0251"
- Containment "By Reference"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$5"
- quid "420146A502E2"
- roles (list role_list
- (object Role "modules"
- quid "420146A6027F"
- label "modules"
- supplier "Logical View::moduleCore::DependentModule"
- quidu "41F6C24B023D"
- client_cardinality (value cardinality "0..*")
- is_navigable TRUE)
- (object Role "$UNNAMED$6"
- quid "420146A60281"
- supplier "Logical View::moduleCore::WorkbenchModule"
- quidu "41E3DF5801FA"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "41E3DF060210"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 100
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::moduleCore::URI" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1920, 1648)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (1460, 1589)
- fill_color 13434879
- nlines 1
- max_width 920
- justify 0
- label "URI")
- stereotype (object ItemLabel
- Parent_View @1
- location (1460, 1539)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 920
- justify 0
- label "<<datatype>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41EC26DA027A"
- compartment (object Compartment
- Parent_View @1
- location (1460, 1650)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 925)
- width 938
- height 242
- annotation 8
- autoResize TRUE)
- (object NoteView @2
- location (448, 1264)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (176, 1055)
- fill_color 13434879
- nlines 8
- max_width 508
- label
-|The module "handle" URI will contain the special Module protocol, project name, and module identifier, and will be fully resolved to a full platform URI
- )
- line_color 3342489
- fill_color 13434879
- width 568
- height 431)
- (object ClassView "Class" "Logical View::moduleCore::WorkbenchModuleResource" @3
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (992, 1744)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (714, 1613)
- fill_color 13434879
- nlines 1
- max_width 556
- justify 0
- label "WorkbenchModuleResource")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41E3DF670039"
- compartment (object Compartment
- Parent_View @3
- location (714, 1674)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 531)
- width 574
- height 286
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::moduleCore::ModuleType" @4
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1856, 1136)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @4
- location (1509, 1030)
- fill_color 13434879
- nlines 1
- max_width 694
- justify 0
- label "ModuleType")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41EC1D5103E2"
- compartment (object Compartment
- Parent_View @4
- location (1509, 1091)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 700)
- width 712
- height 236
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::moduleCore::ProjectModules" @5
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (416, 368)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @5
- location (204, 287)
- fill_color 13434879
- nlines 1
- max_width 424
- justify 0
- label "ProjectModules")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F566DB0251"
- compartment (object Compartment
- Parent_View @5
- location (204, 348)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 431)
- width 442
- height 186
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::moduleCore::DependentModule" @6
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1824, 480)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @6
- location (1470, 349)
- fill_color 13434879
- nlines 1
- max_width 708
- justify 0
- label "DependentModule")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F6C24B023D"
- compartment (object Compartment
- Parent_View @6
- location (1470, 410)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 4
- max_width 715)
- width 726
- height 286
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::moduleCore::WorkbenchModule" @7
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (944, 752)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @7
- location (712, 646)
- fill_color 13434879
- nlines 1
- max_width 464
- justify 0
- label "WorkbenchModule")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41E3DF5801FA"
- compartment (object Compartment
- Parent_View @7
- location (712, 707)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 471)
- width 482
- height 236
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$0" @8
- location (940, 1235)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41E3E14B01E3"
- roleview_list (list RoleViews
- (object RoleView "resources" @9
- Parent_View @8
- location (460, 355)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @10
- Parent_View @9
- location (1075, 1501)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 216
- justify 0
- label "+resources"
- pctDist 0.726776
- height 135
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "41E3E14D031D"
- client @8
- supplier @3
- vertices (list Points
- (940, 1235)
- (940, 1601))
- line_style 3
- origin_attachment (940, 1235)
- terminal_attachment (940, 1601)
- label (object SegLabel @11
- Parent_View @9
- location (861, 1495)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..*"
- pctDist 0.710383
- height 79
- orientation 1))
- (object RoleView "module" @12
- Parent_View @8
- location (460, 355)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @13
- Parent_View @12
- location (1043, 972)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 172
- justify 0
- label "+module"
- pctDist 0.720824
- height 103
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "41E3E14D031F"
- client @8
- supplier @7
- vertices (list Points
- (940, 1235)
- (940, 870))
- line_style 3
- origin_attachment (940, 1235)
- terminal_attachment (940, 870)
- label (object SegLabel @14
- Parent_View @12
- location (868, 976)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.709382
- height 73
- orientation 0))))
- (object AssociationViewNew "$UNNAMED$1" @15
- location (1634, 791)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41EC1D9802C2"
- roleview_list (list RoleViews
- (object RoleView "moduleType" @16
- Parent_View @15
- location (1298, -137)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @17
- Parent_View @16
- location (2010, 977)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 260
- justify 0
- label "+moduleType"
- pctDist 0.911573
- height 153
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "41EC1D990241"
- client @15
- supplier @4
- vertices (list Points
- (1634, 791)
- (1857, 791)
- (1857, 1018))
- line_style 3
- origin_attachment (1634, 791)
- terminal_attachment (1857, 1018)
- label (object SegLabel @18
- Parent_View @16
- location (1804, 972)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 1))
- (object RoleView "$UNNAMED$2" @19
- Parent_View @15
- location (1298, -137)
- stereotype TRUE
- line_color 3342489
- quidu "41EC1D990243"
- client @15
- supplier @7
- vertices (list Points
- (1634, 791)
- (1185, 791))
- line_style 3
- origin_attachment (1634, 791)
- terminal_attachment (1185, 791))))
- (object AttachView "" @20
- stereotype TRUE
- line_color 3342489
- client @2
- supplier @7
- vertices (list Points
- (657, 1048)
- (829, 870))
- line_style 0)
- (object AssociationViewNew "$UNNAMED$3" @21
- location (399, 691)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41F5672000E8"
- roleview_list (list RoleViews
- (object RoleView "workbenchModules" @22
- Parent_View @21
- location (-33, 403)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @23
- Parent_View @22
- location (476, 747)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 373
- justify 0
- label "+workbenchModules"
- pctDist 0.253289
- height 56
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "41F567210111"
- client @21
- supplier @7
- vertices (list Points
- (399, 691)
- (703, 691))
- line_style 3
- origin_attachment (399, 691)
- terminal_attachment (703, 691)
- label (object SegLabel @24
- Parent_View @22
- location (640, 632)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..*"
- pctDist 0.792763
- height 59
- orientation 0))
- (object RoleView "$UNNAMED$4" @25
- Parent_View @21
- location (-33, 403)
- stereotype TRUE
- line_color 3342489
- quidu "41F567210113"
- client @21
- supplier @5
- vertices (list Points
- (399, 691)
- (325, 691)
- (325, 461))
- line_style 3
- origin_attachment (399, 691)
- terminal_attachment (325, 461))))
- (object AssociationViewNew "$UNNAMED$5" @26
- location (1322, 633)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "420146A502E2"
- roleview_list (list RoleViews
- (object RoleView "modules" @27
- Parent_View @26
- location (490, -711)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @28
- Parent_View @27
- location (1367, 545)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 180
- justify 0
- label "+modules"
- pctDist 0.475736
- height 72
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "420146A6027F"
- client @26
- supplier @6
- vertices (list Points
- (1322, 633)
- (1460, 589))
- line_style 0
- label (object SegLabel @29
- Parent_View @27
- location (1427, 662)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..*"
- pctDist 0.636077
- height 59
- orientation 1))
- (object RoleView "$UNNAMED$6" @30
- Parent_View @26
- location (490, -711)
- stereotype TRUE
- line_color 3342489
- quidu "420146A60281"
- client @26
- supplier @7
- vertices (list Points
- (1322, 633)
- (1185, 675))
- line_style 0)))
- (object NoteView @31
- location (2784, 416)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @31
- location (2387, 166)
- fill_color 13434879
- nlines 10
- max_width 759
- label
-|The dependent module "handle" must be resolvable to a WorkbenchModule.
-|
-|The DeployedPath specifies the location of the referenced module in this deployment structure.
-|
-|The dependencyType specifies how the dependent module is assembled.
- )
- line_color 3342489
- fill_color 13434879
- width 819
- height 513)
- (object ClassView "Class" "Logical View::moduleCore::DependencyType" @32
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2560, 944)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @32
- location (2387, 860)
- fill_color 13434879
- nlines 1
- max_width 346
- justify 0
- label "DependencyType")
- stereotype (object ItemLabel
- Parent_View @32
- location (2387, 810)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 346
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "420394F50185"
- compartment (object Compartment
- Parent_View @32
- location (2387, 921)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 3
- max_width 237)
- width 364
- height 292
- annotation 8
- autoResize TRUE)
- (object AttachView "" @33
- stereotype TRUE
- line_color 3342489
- client @6
- supplier @31
- vertices (list Points
- (2187, 455)
- (2374, 443))
- line_style 0)))))
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.ecore b/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.ecore
deleted file mode 100644
index 00723f2..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.ecore
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modulecore"
- nsURI="modulecore.xmi" nsPrefix="org.eclipse.wst.common.modulecore">
- <eClassifiers xsi:type="ecore:EClass" name="WorkbenchModule">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="handle" eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="deployedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="resources" upperBound="-1"
- eType="#//WorkbenchModuleResource" containment="true" eOpposite="#//WorkbenchModuleResource/module"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="moduleType" lowerBound="1"
- eType="#//ModuleType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="modules" upperBound="-1"
- eType="#//DependentModule"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="WorkbenchModuleResource">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourcePath" eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="deployedPath" eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="exclusions" upperBound="-1"
- eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="module" lowerBound="1"
- eType="#//WorkbenchModule" transient="true" eOpposite="#//WorkbenchModule/resources"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ModuleType">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="metadataResources" upperBound="-1"
- eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="moduleTypeId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
- <eClassifiers xsi:type="ecore:EClass" name="ProjectModules">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="workbenchModules" upperBound="-1"
- eType="#//WorkbenchModule" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DependentModule">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="handle" eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="deployedPath" eType="#//URI"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="dependencyType" eType="#//DependencyType"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="DependencyType">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="uses=0
consumes=1"/>
- </eAnnotations>
- <eLiterals name="uses"/>
- <eLiterals name="consumes" value="1"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.mdl b/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.mdl
deleted file mode 100644
index 7e9b4c5..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/rose/moduleCore.mdl
+++ /dev/null
@@ -1,8839 +0,0 @@
-
-(object Petal
- version 50
- _written "Rose 8.3.0407.2800"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Java"
- name "IDE"
- value "Internal Editor")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value ""))
- quid "3A0B2474025F"
- enforceClosureAutoLoad FALSE
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "3A0B2474026A"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "3A0B24790339"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "3A0B24740269"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "3A0B2474027D"
- logical_models (list unit_reference_list
- (object Class_Category "moduleCore"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WORKSPACE_ROOT\\org.eclipse.wst.common.emfworkbench.integration\\rose\\moduleCore.cat"
- quid "3A0DB68B0046"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "PackageView"
- quid "3A0B24790360"
- title "PackageView"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 650
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::moduleCore" @1
- location (352, 320)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (208, 236)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "moduleCore")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3A0DB68B0046"
- width 300
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "3A0B2474027D"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "3A0B24790338"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list)))
- category "Logical View"
- quidu "41EC1C3B00A4")
- process_structure (object Processes
- quid "3A0B2474027E"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "3A0B24740291"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "roseId"
- value "753117540")
- (object Attribute
- tool "Ecore"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)))
- (object Attribute
- tool "Ecore"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isResolveProxies"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Cplusplus"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Const"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "CreateBackupFiles"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "CommentRules"
- value ("CommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "CommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Always synchronize"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Reverse engineering only"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Never synchronize"
- value 4)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "InitialCodeBody"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBody"
- value ("GenerateFunctionBodySet" 2))
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBodySet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Default"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "True"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "False"
- value 0)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "HeaderSourceFile"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "BodySourceFile"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "IsNamespace"
- value FALSE)))
- (object Attribute
- tool "Cplusplus"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSI C++ Event Watcher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSIConvert"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada83"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada83"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada83"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada83"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada83"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada83"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada83"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada83"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada83"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "$ROSEADA83_SOURCE")
- (object Attribute
- tool "Ada83"
- name "DefaultCodeBody"
- value "[statement]")))
- (object Attribute
- tool "Ada83"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassName"
- value "Object")
- (object Attribute
- tool "Ada83"
- name "ClassAccess"
- value ("ImplementationSet" 43))
- (object Attribute
- tool "Ada83"
- name "ImplementationType"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "PolymorphicUnit"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "HandleName"
- value "Handle")
- (object Attribute
- tool "Ada83"
- name "HandleAccess"
- value ("ImplementationSet" 45))
- (object Attribute
- tool "Ada83"
- name "Discriminant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada83"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ClassParameterName"
- value "This")
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada83"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "CopyConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada83"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada83"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ClassEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "HandleEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "IsTask"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada83"
- name "Private"
- value 43)
- (object Attribute
- tool "Ada83"
- name "LimitedPrivate"
- value 200)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "ConstructorKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada83"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada83"
- name "ClassParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada83"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Spec"
- value 1)
- (object Attribute
- tool "Ada83"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada83"
- name "Renaming"
- value 3)
- (object Attribute
- tool "Ada83"
- name "Separate"
- value 4)))
- (object Attribute
- tool "Ada83"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "In"
- value 204)
- (object Attribute
- tool "Ada83"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada83"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada83"
- name "FunctionReturn"
- value 206)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada83"
- name "InitialCodeBody"
- value "${default}")))
- (object Attribute
- tool "Ada83"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${relationship}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada83"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada83"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada83"
- name "After"
- value 234)))))
- (object Attribute
- tool "Ada83"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${attribute}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada83"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada83"
- name "After"
- value 234)))))
- (object Attribute
- tool "Ada83"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada83"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada83"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${target}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada83"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada83"
- name "After"
- value 234)))
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada83"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada95"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada95"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada95"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada95"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada95"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada95"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada95"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "UseColonNotation"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada95"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada95"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "$ROSEADA95_SOURCE")
- (object Attribute
- tool "Ada95"
- name "DefaultCodeBody"
- value "[statement]")))
- (object Attribute
- tool "Ada95"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "TypeName"
- value "Object")
- (object Attribute
- tool "Ada95"
- name "TypeVisibility"
- value ("TypeVisibilitySet" 43))
- (object Attribute
- tool "Ada95"
- name "TypeImplementation"
- value ("TypeImplementationSet" 208))
- (object Attribute
- tool "Ada95"
- name "TypeControl"
- value ("TypeControlSet" 225))
- (object Attribute
- tool "Ada95"
- name "TypeControlName"
- value "Controlled_${type}")
- (object Attribute
- tool "Ada95"
- name "TypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordImplementation"
- value ("RecordImplementationSet" 209))
- (object Attribute
- tool "Ada95"
- name "RecordKindPackageName"
- value "${class}_Record_Kinds")
- (object Attribute
- tool "Ada95"
- name "IsLimited"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessType"
- value ("GenerateAccessTypeSet" 230))
- (object Attribute
- tool "Ada95"
- name "AccessTypeName"
- value "Handle")
- (object Attribute
- tool "Ada95"
- name "AccessTypeVisibility"
- value ("TypeVisibilitySet" 45))
- (object Attribute
- tool "Ada95"
- name "AccessTypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AccessClassWide"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "MaybeAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementation"
- value ("ParameterizedImplementationSet" 11))
- (object Attribute
- tool "Ada95"
- name "ParentClassName"
- value "Superclass")
- (object Attribute
- tool "Ada95"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada95"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada95"
- name "ArrayOfTypeName"
- value "Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfTypeName"
- value "Access_Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "ArrayOfAccessTypeName"
- value "Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfAccessTypeName"
- value "Access_Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "ArrayIndexDefinition"
- value "Positive range <>")
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterName"
- value "This")
- (object Attribute
- tool "Ada95"
- name "GenerateDefaultConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada95"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateCopyConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada95"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDestructor"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada95"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateTypeEquality"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "TypeEqualityName"
- value "${quote}=${quote}")
- (object Attribute
- tool "Ada95"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "TypeImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Tagged"
- value 208)
- (object Attribute
- tool "Ada95"
- name "Record"
- value 210)
- (object Attribute
- tool "Ada95"
- name "Mixin"
- value 211)
- (object Attribute
- tool "Ada95"
- name "Protected"
- value 44)
- (object Attribute
- tool "Ada95"
- name "Task"
- value 212)))
- (object Attribute
- tool "Ada95"
- name "RecordImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SingleType"
- value 209)
- (object Attribute
- tool "Ada95"
- name "MultipleTypes"
- value 213)))
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)
- (object Attribute
- tool "Ada95"
- name "Unconstrained"
- value 214)))
- (object Attribute
- tool "Ada95"
- name "TypeVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada95"
- name "Private"
- value 43)))
- (object Attribute
- tool "Ada95"
- name "SubprogramKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "TypeControlSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "None"
- value 225)
- (object Attribute
- tool "Ada95"
- name "InitializationOnly"
- value 226)
- (object Attribute
- tool "Ada95"
- name "AssignmentFinalizationOnly"
- value 227)
- (object Attribute
- tool "Ada95"
- name "All"
- value 228)))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Always"
- value 229)
- (object Attribute
- tool "Ada95"
- name "Auto"
- value 230)))
- (object Attribute
- tool "Ada95"
- name "IncompleteType"
- value ("IncompleteTypeSet" 1))
- (object Attribute
- tool "Ada95"
- name "TypeControlVisibility"
- value ("TypeVisibilitySet" 43))
- (object Attribute
- tool "Ada95"
- name "IncompleteTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "DoNotDeclare"
- value 1)
- (object Attribute
- tool "Ada95"
- name "NoDiscriminantPart"
- value 2)
- (object Attribute
- tool "Ada95"
- name "UnknownDiscriminantPart"
- value 3)
- (object Attribute
- tool "Ada95"
- name "KnownDiscriminantPart"
- value 4)))))
- (object Attribute
- tool "Ada95"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsPrivate"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada95"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenerateOverriding"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterClassWide"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessOperation"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "EntryBarrierCondition"
- value "True")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Spec"
- value 1)
- (object Attribute
- tool "Ada95"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada95"
- name "Abstract"
- value 3)
- (object Attribute
- tool "Ada95"
- name "Renaming"
- value 4)
- (object Attribute
- tool "Ada95"
- name "RenamingAsBody"
- value 5)
- (object Attribute
- tool "Ada95"
- name "Separate"
- value 6)))
- (object Attribute
- tool "Ada95"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "In"
- value 204)
- (object Attribute
- tool "Ada95"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada95"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada95"
- name "Access"
- value 220)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "InitialCodeBody"
- value "${default}")))
- (object Attribute
- tool "Ada95"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${relationship}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada95"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada95"
- name "After"
- value 234)))
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminantClassWide"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${attribute}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada95"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada95"
- name "After"
- value 234)))
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminantClassWide"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada95"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada95"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${target}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "Declare"
- value ("DeclareSet" 234))
- (object Attribute
- tool "Ada95"
- name "DeclareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Before"
- value 233)
- (object Attribute
- tool "Ada95"
- name "After"
- value 234)))
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminantClassWide"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))))
- (object Attribute
- tool "Ada95"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada95"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "CORBA"
- name "PathSeparator"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Modeler"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "project"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "DomainCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "SPPackageCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TriggerCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IndexCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedureCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TablePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DomainPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IndexPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedurePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ViewCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "JoinCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "cONTAINERCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ViewPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpacePrefix"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDatabase"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TargetDatabase"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Location"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTableSpace"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDeault"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "BufferPool"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ExtentSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PrefetchSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PageSize"
- value 4)
- (object Attribute
- tool "Data Modeler"
- name "ManagedBy"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ContainerList"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmSchema"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmDomainPackage"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSchemaPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DatabaseID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DBMS"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsView"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomain"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSPPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Synonymns"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SelectClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdatable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "CheckOption"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PersistToServer"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CorrelationName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateable"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "IsSnapShot"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDistinct"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsPackage"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IsIdentity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "NullsAllowed"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ColumnType"
- value "Native")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OID"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRelationship"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RIMethod"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrict"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrictName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicityName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsConstraint"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsTrigger"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsStoredProcedure"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsCluster"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "FillFactor"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "KeyList"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CheckPredicate"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DeferalMode"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "InitialCheckTime"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInsertEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDeleteEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "RefOldTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefOldRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRow"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "WhenClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Language"
- value "SQL")
- (object Attribute
- tool "Data Modeler"
- name "ProcType"
- value "Procedure")
- (object Attribute
- tool "Data Modeler"
- name "IsDeterministic"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ParameterStyle"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ReturnedNull"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ExternalName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Parameter"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInParameter"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "IsOutParameter"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OperationID"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler Communicator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "RootDir"
- value "")
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "AutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ShowCodegenDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocDefaultAuthor"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultVersion"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultSince"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocNumAsterisks"
- value 0)
- (object Attribute
- tool "Java"
- name "MaxNumChars"
- value 80)
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)
- (object Attribute
- tool "Java"
- name "Microsoft"
- value 201)
- (object Attribute
- tool "Java"
- name "IBM"
- value 202)))
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "m_")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "s_")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "NoClassCustomDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "OpenBraceMethodStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)
- (object Attribute
- tool "Java"
- name "NotShowRoseIDDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateRoseID"
- value TRUE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultReturnLine"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "ReferenceClasspath"
- value "")
- (object Attribute
- tool "Java"
- name "VAJavaWorkingFolder"
- value "")
- (object Attribute
- tool "Java"
- name "BeanPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "BeanSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "RemotePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "RemoteSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "HomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "HomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeySuffix"
- value "")
- (object Attribute
- tool "Java"
- name "EJBDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "ServletDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultEJBVersion"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultServletVersion"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateDefaultJ2EEJavadoc"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UserDefineJavaDocTags"
- value "")
- (object Attribute
- tool "Java"
- name "LocalPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "SourceControl"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCSelected"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCProjectSourceRoot"
- value "")
- (object Attribute
- tool "Java"
- name "SCCProjectName"
- value "")
- (object Attribute
- tool "Java"
- name "SCCComment"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "Default_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "Http_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "Default_EJB__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedReturn"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReplaceExistingCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsNavigable"
- value TRUE)))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "R2Editor"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ComponentTest"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SpecialDeclReturnType"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateFriendBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateFriendDecl"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 109))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 219))
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportBinary"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Web Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "XML_DTD"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "XML_DTD"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "XML_DTD"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "XML_DTD"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Entity_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Entity_PublicID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "NotationValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "InternalValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "ParameterEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ExternalEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "Notation_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Notation_PublicID"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "DefaultDeclType"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Assign All"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ComponentPath"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ClearCase"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SoDA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "TopLink"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "CreateBackupFiles"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "CommentRules"
- value ("CommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "CommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Always synchronize"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Reverse engineering only"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Never synchronize"
- value 4)))))
- (object Attribute
- tool "Ada83"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Mode"
- value ("ParameterModeSet" 232))
- (object Attribute
- tool "Ada83"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Default"
- value 232)
- (object Attribute
- tool "Ada83"
- name "In"
- value 204)
- (object Attribute
- tool "Ada83"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada83"
- name "InOut"
- value 203)))))
- (object Attribute
- tool "Ada95"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Mode"
- value ("ParameterModeSet" 232))
- (object Attribute
- tool "Ada95"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Default"
- value 232)
- (object Attribute
- tool "Ada95"
- name "In"
- value 204)
- (object Attribute
- tool "Ada95"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada95"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada95"
- name "Access"
- value 220)))))
- (object Attribute
- tool "Deploy"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "BodyReferenceOnly"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Direction"
- value ("ParamDirectionTypeSet" 102))
- (object Attribute
- tool "CORBA"
- name "ParamDirectionTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "in"
- value 102)
- (object Attribute
- tool "CORBA"
- name "inout"
- value 103)
- (object Attribute
- tool "CORBA"
- name "out"
- value 104))))))
- quid "3A0B2474027F"))
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
deleted file mode 100644
index d0100dc..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emfworkbench.integration">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.emfworkbench.integration" id="adapterFactory" name="Adapter Factory Extension"/>
- </appInfo>
- <documentation>
- This is used to register an adapter factory with the dynamic adapter factory.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="adapterFactory" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="adapterFactory">
- <annotation>
- <documentation>
- Defines the Adapter Factory being added. All added Adapter Factories are queriable whenever their Function Group and optional Viewer Id are specified.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="view" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="packageURI" type="string" use="required">
- <annotation>
- <documentation>
- The package URI that you are extending (for example "ejb.xmi")
- </documentation>
- </annotation>
- </attribute>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified name of the class which implements org.eclipse.emf.common.notify.AdapterFactory.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The Unique identifier of the Adapter Factory extension. This will associate it with one or more function groups based on the function group patterns. Function Groups allow Content and Actions to be enabled or disabled based on project-specific information. Generally, they are used by vendors who wish to add functionality specific to their products, e.g. J2EE Application Servers.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="functionGroupID" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="view">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- An optional viewer Id which will limit the invocation of the defined Adapter Factory to the given viewer 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="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.emfworkbench.integration/schema/editModel.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
deleted file mode 100644
index 14743b2..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModel.exsd
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emfworkbench.integration">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.emfworkbench.integration" id="editModel" name="EMF Resource Edit Model"/>
- </appInfo>
- <documentation>
- Edit models provide a framework for managing a set of EMF resources within a unit of work. For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources. Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor. By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="editModel" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="editModel">
- <annotation>
- <documentation>
- The declaration for an edit model to be used in the workspace.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="editModelResource" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="editModelID" type="string" use="required">
- <annotation>
- <documentation>
- A unique identifier for the edit model.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="factoryClass" type="string" use="required">
- <annotation>
- <documentation>
- An optional factory class that is used for this edit model. The class must implement the interface <code>org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory</code>. If none is specified, then a generic <code>EditModel</code> is created.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="loadUnknownResourcesAsReadOnly" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="parentModelID" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="editModelResource">
- <annotation>
- <documentation>
- This is an individual contribution of a resource to the edit model. If more than one instance of the same URI is registered against an edit model id, the resource is still only loaded once.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="URI" type="string" use="required">
- <annotation>
- <documentation>
- The URI of the resource relative to the root container from which EMF resources are loaded.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="autoload" type="boolean" use="default" value="false">
- <annotation>
- <documentation>
- Indicator which determines whether this resource should be autoloaded when the edit model is created, or when an IFile corresponding to this resource is added.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="resourceExtension">
- <annotation>
- <documentation>
- This allows registration of files for autoloading according to file extension.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The file extension itself ("myxmi")
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <extension
- id="editModel.acme.parent"
- name="Acme Parent Edit Model"
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="com.acme.acmepro.parent.editModel"
- factoryClass="org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory">
- <editModelResource URI="DIR/resource0.xml"/>
- <editModelResource URI="DIR/resource1.xml"/>
- </editModel>
- </extension>
-
- <extension
- id="editModel.acme.child"
- name="Acme Child Edit Model"
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="com.acme.acmepro.child.editModel"
- factoryClass="org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory"
- parentModelID="com.acme.acmepro.parent.editModel">
- <editModelResource URI="DIR/resource2.xml"/>
- <editModelResource URI="DIR/resource3.xml"/>
- </editModel>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Edit Models can be accessed through the <code>org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext</code>.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.emfworkbench.integration/schema/editModelExtension.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
deleted file mode 100644
index 006d2ae..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/editModelExtension.exsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emfworkbench.integration">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.emfworkbench.integration" id="editModelExtension" name="Edit Model Extensions"/>
- </appInfo>
- <documentation>
- The Edit Model Extension allows third parties to contribute expected resources to Edit Models. The functionGroupID allows users to select which extensions they choose to have enabled.
- </documentation>
- </annotation>
-
- <include schemaLocation="editModel.exsd"/>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="editModelExtension" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="editModelExtension">
- <annotation>
- <documentation>
- Edit model extensions allow components to contribute known resource URIs to an edit model. Whenever an edit model is loaded, the resources will automatically be loaded and managed by the edit model. Changes to the resources will be tracked and saved during operations or editor saves.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="editModelResource" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="editModelID" type="string" use="required">
- <annotation>
- <documentation>
- The unique id of the edit model being extended.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The unique identifier for this extension. This will be used to associate it with a function group pattern binding.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="org.sample.inheritance.parent.editModel"
- functionGroupID="org.sample.group">
- <editModelResource URI="DIR/extension0.xml"/>
- <editModelResource URI="DIR/extension1.xml"/>
- </editModelExtension>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.emfworkbench.integration/schema/modifierHelperFactory.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
deleted file mode 100644
index 9cc07db..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/modifierHelperFactory.exsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emfworkbench.integration">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.emfworkbench.integration" id="ModifierHelperFactory" name="Modifier Helper Factory"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This is used to register for the model modifiers.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <sequence>
- <element ref="package" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="package">
- <complexType>
- <sequence>
- <element ref="type" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="uri" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="type">
- <complexType>
- <sequence>
- <element ref="feature" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="feature">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="action" type="string">
- <annotation>
- <documentation>
-
- </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="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/CompatibilityWorkbenchURIConverterImpl.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/CompatibilityWorkbenchURIConverterImpl.java
deleted file mode 100644
index 8ae0cd1..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/CompatibilityWorkbenchURIConverterImpl.java
+++ /dev/null
@@ -1,90 +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
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityURIConverter;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CompatibilityWorkbenchURIConverterImpl extends WorkbenchURIConverterImpl implements CompatibilityURIConverter {
- /**
- *
- */
- public CompatibilityWorkbenchURIConverterImpl() {
- super();
- }
-
- /**
- * @param anInputContainer
- */
- public CompatibilityWorkbenchURIConverterImpl(IContainer anInputContainer) {
- super(anInputContainer);
- }
-
- /**
- * @param aContainer
- * @param aSynchronizer
- */
- public CompatibilityWorkbenchURIConverterImpl(IContainer aContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- super(aContainer, aSynchronizer);
- }
-
- /**
- * @param anInputContainer
- * @param anOutputContainer
- */
- public CompatibilityWorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer) {
- super(anInputContainer, anOutputContainer);
- }
-
- /**
- * @param anInputContainer
- * @param anOutputContainer
- * @param aSynchronizer
- */
- public CompatibilityWorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- super(anInputContainer, anOutputContainer, aSynchronizer);
- }
-
- /**
- * @see com.ibm.etools.xmi.helpers.CompatibilityURIConverter#deNormalize(URI)
- */
- public URI deNormalize(URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri)) {
- IFile aFile = WorkbenchResourceHelper.getPlatformFile(uri);
- if (aFile != null) {
- IProject fileProject = aFile.getProject();
- //If it is not in the same project then just return the URI as is.
- if (resourceSetSynchronizer.getProject() == fileProject)
- return getContainerRelativeURI(aFile);
- }
- }
- return uri;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/DynamicGrowthModel.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/DynamicGrowthModel.java
deleted file mode 100644
index d6a9a6d..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/DynamicGrowthModel.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.emfworkbench;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-
-
-public class DynamicGrowthModel {
-
- private static final int MINIMUM_OPTIMAL_SIZE = 10;
-
- private static final int MEMORY_THRESHHOLD = 100;
-
- private static final int NOTICEABLE_CHANGE = 5;
-
-
- /* Stores a FIFO list of the Key types (IPath)*/
- private final List queue = new LinkedList();
-
- /* We use an int[] as the value so we don't have to keep creating Integer objects */
- private final Map/* <IPath, int[]> */ uniquesMap = new HashMap();
-
-
- /**
- * Inject the key into the DynamicGrowthModel. May or may not affect the
- * dynamic size.
- *
- * @param key The key to inject into the model
- * @return True if the optimal size changed greather than {@value NOTICEABLE_CHANGE} as a result of the injection.
- */
- public synchronized boolean injectKey(IPath key) {
-
- int originalSize = getOptimalSize();
-
- int[] count = null;
- if( (count = (int[]) uniquesMap.get(key)) != null ) {
- /* increment the count */
- ++count[0];
- } else {
- /* insert the first count */
- uniquesMap.put(key, count = new int[] { 1 } );
- }
-
- if( queue.size() == MEMORY_THRESHHOLD ) {
-
- /* take the oldest value off the queue */
- IPath oldestKey = (IPath) queue.remove(0);
-
- /* determine if another instance of the oldest key is still in the queue */
- count = (int[]) uniquesMap.get(oldestKey);
- Assert.isNotNull(count);
-
- /* Reduce the count */
- count[0] -= 1;
-
- /* Count should never be negative */
- Assert.isTrue(count[0] >= 0);
-
-
- /* This unique key is no longer in the queue*/
- if(count[0] == 0) {
- uniquesMap.remove(oldestKey);
- }
-
-
-
- }
- /* Add the newKey to end of the list*/
- queue.add(key);
-
- return Math.abs( originalSize - getOptimalSize() ) > NOTICEABLE_CHANGE;
-
- }
-
- /**
- * The optimal size is an integer from [{@value #MINIMUM_OPTIMAL_SIZE}, {@value #MEMORY_THRESHHOLD}].
- *
- * @return the optimal size for the LRU Cache.
- */
- public int getOptimalSize() {
- return uniquesMap.size() > MINIMUM_OPTIMAL_SIZE ? uniquesMap.size() : MINIMUM_OPTIMAL_SIZE;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchContext.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchContext.java
deleted file mode 100644
index 66c6b35..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchContext.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 3, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.util.emf.workbench.EMFWorkbenchContextBase;
-import org.eclipse.jem.util.emf.workbench.ISynchronizerExtender;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedXMIFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.DefaultOverridableResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ProjectResourceSetEditImpl;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EMFWorkbenchContext extends EMFWorkbenchContextBase implements ISynchronizerExtender {
-
- private Map readOnlyModels = new HashMap();
- private Map editableModels = new HashMap();
-
- protected Adapter resourceSetListener;
-
- protected boolean defaultToMOF5Compatibility = false;
-
-
- /**
- * @param aProject
- */
- public EMFWorkbenchContext(IProject aProject) {
- super(aProject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext#initializeResourceSet(org.eclipse.wst.common.internal.emfworkbench.ProjectResourceSet)
- */
- protected void initializeResourceSet(ProjectResourceSet aResourceSet) {
- super.initializeResourceSet(aResourceSet);
- Resource.Factory.Registry reg = new DefaultOverridableResourceFactoryRegistry();
- Resource.Factory factory = new ReferencedXMIFactoryImpl();
- reg.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
- // add xmi because other plugins are registering it globally
- reg.getExtensionToFactoryMap().put("xmi", factory); //$NON-NLS-1$
- aResourceSet.setResourceFactoryRegistry(reg);
- aResourceSet.getSynchronizer().addExtender(this); // added so we can be informed of closes
- // to the project.
- startListeningToResourceSet();
- }
-
- public static String getCacheID(String editModelID, Map params) {
- return EditModelRegistry.getInstance().getCacheID(editModelID, params);
- }
-
- /**
- * This is the API that clients should use when they have an intent to modify a particular
- * resource. You should only access the resources through the J2EEEditModel that is returned by
- * this method if you have the intent to modify.
- *
- * @see J2EEEditModel
- */
- public final EditModel getEditModelForWrite(String editModelID, Object accessorKey, Map params) {
- EditModel editModel = getExistingEditModel(editModelID, params, false);
- if (null == editModel) {
- editModel = createEditModelForWrite(editModelID, params);
- synchronized (editModel) {
- cacheEditModel(editModel, params);
- editModel.access(accessorKey);
- }
- } else {
- if (editModel.isDisposed() || editModel.isDisposing()) {
- editModel = createEditModelForWrite(editModelID, params);
- cacheEditModel(editModel, params);
- }
- synchronized (editModel) {
- editModel.access(accessorKey);
- }
- }
- return editModel;
- }
-
- /**
- * This is the API that clients should use when they want to read a group of resources that are
- * normally managed by the edit model with
- *
- * @aKey. You should only access the resources through the J2EEEditModel that is returned by
- * this method. You must call releaseEditModel(...) when you are finished with the edit
- * model.
- * @see J2EEEditModel
- */
- public final EditModel getEditModelForRead(String editModelID, Object accessorKey, Map params) {
- try {
- EditModel editModel = getExistingEditModel(editModelID, params, true);
- if (null == editModel) {
- editModel = createEditModelForRead(editModelID, params);
- synchronized (editModel) {
- cacheEditModel(editModel, params);
- EditModelLeastUsedCache.getInstance().access(editModel);
- editModel.access(accessorKey);
- }
- } else {
- if (editModel.isDisposed() || editModel.isDisposing()) {
- editModel = createEditModelForRead(editModelID, params);
- cacheEditModel(editModel, params);
- }
- synchronized (editModel) {
- EditModelLeastUsedCache.getInstance().access(editModel);
- editModel.access(accessorKey);
- }
- }
- return editModel;
- } finally {
- EditModelLeastUsedCache.getInstance().optimizeLRUSizeIfNecessary();
- }
- }
-
- /**
- * This is the API that clients should use when they have an intent to modify a particular
- * resource. You should only access the resources through the J2EEEditModel that is returned by
- * this method if you have the intent to modify.
- *
- * @see J2EEEditModel
- */
- public final EditModel getEditModelForWrite(String editModelID, Object accessorKey) {
- return getEditModelForWrite(editModelID, accessorKey, null);
- }
-
- /**
- * This is the API that clients should use when they want to read a group of resources that are
- * normally managed by the edit model with
- *
- * @aKey. You should only access the resources through the J2EEEditModel that is returned by
- * this method. You must call releaseEditModel(...) when you are finished with the edit
- * model.
- * @see J2EEEditModel
- */
- public final EditModel getEditModelForRead(String editModelID, Object accessorKey) {
- return getEditModelForRead(editModelID, accessorKey, null);
- }
-
-
-
- public EditModel getExistingEditModel(String editModelID, Map params, boolean isReadOnly) {
- EditModel editModel = null;
- synchronized (readOnlyModels) {
- if (isReadOnly) {
- editModel = (EditModel) readOnlyModels.get(getCacheID(editModelID, params));
- } else {
- synchronized (editableModels) {
- editModel = (EditModel) editableModels.get(getCacheID(editModelID, params));
- }
- }
- }
- return editModel;
- }
-
- /**
- * Subclasses may override to return the appropriate read-only J2EEEditModel.
- */
- protected EditModel createEditModelForRead(String editModelID, Map params) {
- return EditModelRegistry.getInstance().createEditModelForRead(editModelID, this, params);
- }
-
- /**
- * Subclasses may override to return the appropriate J2EEEditModel.
- */
- protected EditModel createEditModelForWrite(String editModelID, Map params) {
- return EditModelRegistry.getInstance().createEditModelForWrite(editModelID, this, params);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/16/2001 12:25:39 PM)
- *
- * @return java.util.List
- */
- public void cacheEditModel(EditModel editModel, Map params) {
- editModel.setParams(params);
- synchronized (readOnlyModels) {
- if (editModel.isReadOnly())
- readOnlyModels.put(getCacheID(editModel.getEditModelID(), params), editModel);
- else
- synchronized (editableModels) {
- editableModels.put(getCacheID(editModel.getEditModelID(), params), editModel);
- }
- }
- }
-
- protected void discardAllEditModels() {
- synchronized (readOnlyModels) {
- synchronized (editableModels) {
- Collection readOnly = readOnlyModels.values();
- EditModelLeastUsedCache.getInstance().removeAllCached(readOnly);
- discardModels(readOnly);
- discardModels(editableModels.values());
- }
- }
-
- }
-
- private void discardModels(Collection editModels) {
- if (editModels != null && !editModels.isEmpty()) {
- // Make a copy for safety against concurrent modification
- Iterator it = new ArrayList(editModels).iterator();
- while (it.hasNext()) {
- ((EditModel) it.next()).dispose();
- }
- }
- }
-
- public void removeEditModel(EditModel editModel, boolean readOnly) {
- // The best way would be to recompute the cache id, but we don't care
- // because the edit model should only be cached once anyway
- synchronized (readOnlyModels) {
- if (readOnly)
- readOnlyModels.values().remove(editModel);
- else
- synchronized (editableModels) {
- editableModels.values().remove(editModel);
- }
- }
- }
-
- /**
- * Notify all editModels of the change.
- */
- protected void notifyEditModels(EditModelEvent anEvent) {
- if (anEvent == null)
- return;
- List aList = new ArrayList();
- synchronized (readOnlyModels) {
- synchronized (editableModels) {
- aList.addAll(readOnlyModels.values());
- aList.addAll(editableModels.values());
- }
- }
- EditModel editModel;
- for (int i = 0; i < aList.size(); i++) {
- editModel = (EditModel) aList.get(i);
- try {
- editModel.resourceChanged(anEvent);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- protected boolean shouldNotifyEditModels() {
- synchronized (readOnlyModels) {
- synchronized (editableModels) {
- return !this.readOnlyModels.isEmpty() || !this.editableModels.isEmpty();
- }
- }
- }
-
- protected Adapter getResourceSetListener() {
- if (resourceSetListener == null)
- resourceSetListener = new ResourceSetListener();
- return resourceSetListener;
- }
-
-
- protected class ResourceSetListener extends AdapterImpl {
- /*
- * @see Adapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier,
- * int,(EStructuralFeature) EObject, Object, Object, int))
- */
- public void notifyChanged(Notification notification) {
- switch (notification.getEventType()) {
- case Notification.ADD :
- addedResource((Resource) notification.getNewValue());
- break;
- case Notification.REMOVE :
- removedResource((Resource) notification.getOldValue());
- break;
- case Notification.REMOVE_MANY :
- removedResources((List) notification.getOldValue());
- break;
- }
- }
- }
-
- /**
- * Notify all editModels of the change.
- */
- public void addedResource(Resource addedResource) {
- if (defaultToMOF5Compatibility && (addedResource != null) && (addedResource instanceof CompatibilityXMIResource))
- ((CompatibilityXMIResource) addedResource).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- if (shouldNotifyEditModels()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.ADDED_RESOURCE, null);
- event.addResource(addedResource);
- notifyEditModels(event);
- }
- }
-
- /**
- * Notify all editModels of the change.
- */
- public void removedResource(Resource removedResource) {
- if (shouldNotifyEditModels()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.REMOVED_RESOURCE, null);
- event.addResource(removedResource);
- notifyEditModels(event);
- }
- }
-
- /**
- * Notify all editModels of the change.
- */
- public void removedResources(List removedResources) {
- if (shouldNotifyEditModels()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.REMOVED_RESOURCE, null);
- event.addResources(removedResources);
- notifyEditModels(event);
- }
- }
-
- protected void startListeningToResourceSet() {
- ResourceSet set = getResourceSet();
- if (set != null)
- set.eAdapters().add(getResourceSetListener());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.ISynchronizerExtender#projectChanged(org.eclipse.core.resources.IResourceDelta)
- */
- public void projectChanged(IResourceDelta delta) {
- // default nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.ISynchronizerExtender#projectClosed()
- */
- public void projectClosed() {
- discardAllEditModels();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContextBase#createURIConverter(org.eclipse.wst.common.internal.emfworkbench.ProjectResourceSet)
- */
- protected WorkbenchURIConverter createURIConverter(ProjectResourceSet aResourceSet) {
- return new CompatibilityWorkbenchURIConverterImpl(getProject(), aResourceSet.getSynchronizer());
- }
-
- protected ProjectResourceSet createResourceSet() {
- if (project == null)
- throw new IllegalStateException("Attempt to create resource set with null project"); //$NON-NLS-1$
- return new ProjectResourceSetEditImpl(project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContextBase#deleteFile(org.eclipse.emf.ecore.resource.Resource)
- */
- public void deleteFile(Resource resource) {
- try {
- WorkbenchResourceHelper.deleteResource(resource);
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
-
- }
-
- /**
- * @return Returns the defaultToMOF5Compatibility.
- */
- public boolean isDefaultToMOF5Compatibility() {
- return defaultToMOF5Compatibility;
- }
-
- /**
- * @param defaultToMOF5Compatibility
- * The defaultToMOF5Compatibility to set.
- */
- public void setDefaultToMOF5Compatibility(boolean defaultToMOF5Compatibility) {
- this.defaultToMOF5Compatibility = defaultToMOF5Compatibility;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchEditResourceHandler.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchEditResourceHandler.java
deleted file mode 100644
index 8bd1073..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EMFWorkbenchEditResourceHandler.java
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-/*
- * Created on May 25, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.internal.emfworkbench;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class EMFWorkbenchEditResourceHandler extends NLS {
- private static final String BUNDLE_NAME = "emfworkbenchedit";//$NON-NLS-1$
-
- private EMFWorkbenchEditResourceHandler() {
- // Do not instantiate
- }
-
- public static String ClientAccessRegistryException_UI_1;
- public static String ClientAccessRegistryException_UI_0;
- public static String Snapshot_ERROR_0;
- public static String EditModelRegistry_ERROR_2;
- public static String EditModelRegistry_ERROR_1;
- public static String EditModelRegistry_ERROR_0;
- public static String AdapterFactoryDescriptor_ERROR_1;
- public static String AdapterFactoryDescriptor_ERROR_0;
- public static String DynamicAdapterFactory_ERROR_0;
- public static String ClientAccessRegistry_ERROR_1;
- public static String ClientAccessRegistry_ERROR_0;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EMFWorkbenchEditResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
deleted file mode 100644
index 0401cb7..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.emfworkbench;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-/**
- * This class will be used to cache the recently used edit models. Loading and unloading of edit models can be
- * costly, especially if operations and/or post operations have a need to reload the same edit model repeatedly.
- * This will allow those repeatedly used edit models to be cached, thereby improving performance. By design, the
- * edit models load resources and these resources are stored in memory, so we don't want to cache every edit
- * model accessed, so this is a least used cache mechanism, where the max size is 10. If an edit model is used
- * it is put to the back of the stack, and new edit models accessed are put to the back of the stack, so that the
- * top of the stack is the first edit model disposed when the cache is higher than the threshhold.
- *
- */
-public class EditModelLeastUsedCache {
-
- /**
- * Provide a singleton instance.
- */
- private static EditModelLeastUsedCache INSTANCE = new EditModelLeastUsedCache();
-
- /**
- * The threshold, or most edit models we will keep open at a time is 10. This is low enough to not
- * overwhelm workbench memory and high enough to aid in operations which continually reload 3-4
- * edit models.
- */
- private final static int threshhold = 10;
-
- /**
- * A LHS is required to ensure the order of the items is maintained. Other
- * Set implementations (HashSet, TreeSet) do not preserve the order. This
- * is critical to the implementation. DO NOT CHANGE THIS.
- */
- private LinkedHashSet lru = new LinkedHashSet(threshhold);
-
- /**
- * Accessor for the EditModelLeastUsedCache INSTANCE
- *
- * @return the EditModelLeastUsedCache INSTANCE
- */
- public static EditModelLeastUsedCache getInstance() {
- return INSTANCE;
- }
-
- /**
- * Remove the all elements from the lru that are contained
- * in <code>aCollection</code>. This method assumes the
- * EditModels in the aCollection will be discarded and it
- * will not attempt to decrememt its reference count.
- * @param aCollection - A {@link Collection} of {@link EditModel}.
- */
- public void removeAllCached(Collection aCollection) {
- if (aCollection != null) {
- lru.removeAll(aCollection);
- }
- }
-
- /**
- * An {@link EditModel} is being accessed so we will want
- * to update the lru and access the editModel which will hold
- * a reference count.
- * @param editModel - The {@link EditModel} that we want to place
- * in the least used cache.
- */
- public void access(EditModel editModel) {
- boolean shouldAccess = true;
- synchronized (lru) {
- if (lru.contains(editModel)) {
- moveToEnd(editModel);
- shouldAccess = false;
- }
- }
- if (shouldAccess) {
- editModel.access(this);
- synchronized (lru) {
- lru.add(editModel);
- }
- }
- }
-
- /**
- * If we hit the capacity of the lru then remove the first one
- * and release access.
- */
- public void optimizeLRUSizeIfNecessary() {
- EditModel model = null;
-
- synchronized (lru) {
- if (lru.size() > threshhold) {
- // remove oldest element and release the edit model.
- Iterator iterator = lru.iterator();
- model = (EditModel) iterator.next();
- if (model != null) {
- lru.remove(model);
- }
- }
- }
- if (model != null)
- model.releaseAccess(this);
- }
-
- /**
- * Move the editModel to the end of the list
- * @param editModel -- EditModel to be moved
- */
- private void moveToEnd(EditModel editModel) {
- lru.remove(editModel);
- lru.add(editModel);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfPackagePropertyTester.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfPackagePropertyTester.java
deleted file mode 100644
index 9959402..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfPackagePropertyTester.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.emfworkbench;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.ecore.EObject;
-
-public class EmfPackagePropertyTester extends PropertyTester {
-
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- if (receiver == null || !(receiver instanceof EObject) || expectedValue == null || !(expectedValue instanceof String))
- return false;
-
- EObject eObject = (EObject) receiver;
- String emfPackage = (String)expectedValue;
- return emfPackage.equals(eObject.eClass().getEPackage().getNsURI());
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfValidationHandler.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfValidationHandler.java
deleted file mode 100644
index 29f42c7..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EmfValidationHandler.java
+++ /dev/null
@@ -1,61 +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.internal.emfworkbench;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.validation.internal.IValidationSelectionHandler;
-
-
-/**
- * Emf validation extension for valaditemenuaction
- */
-public class EmfValidationHandler implements IValidationSelectionHandler {
-
- private String validationType = null;
-
- /**
- * Default constructor
- */
- public EmfValidationHandler() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getBaseValidationType(java.lang.Object)
- */
- public IResource getBaseValidationType(Object selection) {
- if (selection instanceof EObject) {
- EObject eObject = (EObject) selection;
- Resource resource = eObject.eResource();
- IProject project = ProjectUtilities.getProject(resource);
- return project;
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getValidationTypeString()
- */
- public String getValidationTypeString() {
- return validationType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#setValidationTypeString(java.lang.String)
- */
- public void setValidationTypeString(String validationType) {
- this.validationType = validationType;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java
deleted file mode 100644
index d1b36ea..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-
-/**
- * This ResourceSet is to be used by plugins that are currently loading to a cached ResourceSet that
- * always loads relative to the Workbench. This ResourceSet will direct the loads to the appropriate
- * Project ResourceSet. It will only load in this ResourceSet if it was unable to load via the
- * Workspace.
- *
- * If you set want to used this ResourceSet so that the loaded resources are isolated from everyone
- * else, you should use the
- *
- * @link PassthruResourceSet(IProject) constructor. This will load all resources locally and it will
- * not delegate to another ProjectResourceSet. This would be equivalent to creating a
- * ProjectResourceSet without setting any handlers.
- *
- */
-public class PassthruResourceSet extends ProjectResourceSetImpl {
- protected boolean isIsolated = false;
-
- public class PassthruResourcesEList extends ResourceSetImpl.ResourcesEList {
- public boolean add(Object object) {
- if (object == null)
- return false;
- ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(((Resource) object).getURI());
- if (set != null)
- return set.getResources().add((Resource)object);
-
- return super.add(object);
- }
-
-
- public boolean addAll(Collection collection) {
- if (collection.isEmpty())
- return false;
- Iterator it = collection.iterator();
- Resource res;
- while (it.hasNext()) {
- res = (Resource) it.next();
- if (!WorkbenchResourceHelperBase.cacheResource(res))
- super.add(res);
- }
- return true;
- }
- }
-
- public PassthruResourceSet() {
- isIsolated = false;
- }
-
- /**
- * This constructor should only be used if you want to use this ResourceSet isolated from the
- * actual cached ProjectResourcSet for the passed IProject.
- */
- public PassthruResourceSet(IProject project) {
- setProject(project);
- isIsolated = true;
- }
-
- public boolean isIsolated() {
- return isIsolated;
- }
-
- public Resource createResource(URI uri) {
- Resource result = WorkbenchResourceHelperBase.getExistingOrCreateResource(uri);
- if (result == null)
- return super.createResource(uri);
- return result;
- }
-
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandCreateResource(URI)
- */
- protected Resource demandCreateResource(URI uri) {
- Resource result = WorkbenchResourceHelperBase.createResource(uri);
- if (result == null)
- return super.createResource(uri); //We do want to call super.createResource and not
- // demandCreateResource
- return result;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public EList getResources() {
- if (isIsolated)
- return super.getResources();
- if (resources == null) {
- resources = new PassthruResourcesEList();
- }
- return resources;
- }
-
- /**
- * @see org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl#createResourceFromHandlers(URI)
- */
- protected Resource createResourceFromHandlers(URI uri) {
- if (!isIsolated)
- return super.createResourceFromHandlers(uri);
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl#getResourceFromHandlers(URI)
- */
- protected Resource getResourceFromHandlers(URI uri) {
- if (!isIsolated)
- return super.getResourceFromHandlers(uri);
- return null;
- }
-
- /**
- * @see com.ibm.etools.emf.workbench.ProjectResourceSetImpl#getEObjectFromHandlers(URI, boolean)
- */
- protected EObject getEObjectFromHandlers(URI uri, boolean loadOnDemand) {
- if (!isIsolated)
- return super.getEObjectFromHandlers(uri, loadOnDemand);
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java
deleted file mode 100644
index 6296984..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 3, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench;
-
-import java.io.OutputStream;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedXMIFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WorkbenchResourceHelper extends WorkbenchResourceHelperBase {
- protected static Class REFERENCED_RES_CLASS = ReferencedResource.class;
- private static boolean fileAdapterFactoryInitialized = false;
-
- private static class FileAdapterFactory extends AdapterFactoryImpl {
-
- public Adapter adaptNew(Notifier target, Object type) {
- FileAdapter adapter = new FileAdapter();
- adapter.setTarget(target);
- return adapter;
- }
-
- }
-
- /**
- * This class is internal and is used to store state on the resource, specifically, a cached
- * reference to the IFile
- */
- private static class FileAdapter extends AdapterImpl {
- public static final Object ADAPTER_KEY = FileAdapter.class.getName();
- private static final long delay = 30;
- private IFile file;
- private long synchronizationStamp;
- protected ResourceSet previousResourceSet;
- private ILock saveLock;
- public static final int FILE_NOT_LOADED = 0;
- public static final int FILE_INACCESSIBLE = -1;
-
- public boolean isAdapterForType(Object type) {
- return ADAPTER_KEY.equals(type);
- }
-
- /*
- * Update the synchronization stamp where appropriate
- */
- public void notifyChanged(Notification msg) {
- switch (msg.getFeatureID(null)) {
- case Resource.RESOURCE__IS_LOADED :
- if (getResource().isLoaded())
- handleLoaded();
- else
- handleUnloaded();
- break;
- case ReferencedResource.RESOURCE_ABOUT_TO_SAVE:
- handleAboutToSave();
- break;
- case ReferencedResource.RESOURCE_WAS_SAVED:
- handleSaved();
- break;
- case ReferencedResource.RESOURCE_SAVE_FAILED:
- handleSaveFailed();
- break;
- case Resource.RESOURCE__URI :
- handleURIChanged();
- }
- }
-
- private void handleSaveFailed() {
- releaseSaveLock();
-
- }
-
- private void handleAboutToSave() {
- aquireSaveLock();
- }
-
- private void aquireSaveLock() {
-// System.out.println("FileName: " + getFile().getName() + " " +getFile());
-// System.out.println("aquiredSaveLock: " + Thread.currentThread().getName());
-// System.out.println("Depth" + getSaveLock().getDepth());
-// System.out.println("Instance:"+getSaveLock().hashCode());
-// new Exception().printStackTrace(System.out);
- getSaveLock().acquire();
-
- }
-
- private boolean aquireSaveLock(long delay) throws InterruptedException {
-// System.out.println("FileName: " + getFile().getName() + " " +getFile());
-// System.out.println("aquiredSaveLock with delay: " + Thread.currentThread().getName());
-// System.out.println("Depth" + getSaveLock().getDepth());
-// System.out.println("Instance:"+getSaveLock().hashCode());
-// new Exception().printStackTrace(System.out);
-
- return getSaveLock().acquire(delay);
-
- }
-
- private void releaseSaveLock() {
-// System.out.println("FileName: " + getFile().getName() + " " +getFile());
-// System.out.println("releasedSaveLock: " + Thread.currentThread().getName());
-// System.out.println("Depth" + getSaveLock().getDepth());
-// System.out.println("Instance:"+getSaveLock().hashCode());
-// new Exception().printStackTrace(System.out);
- getSaveLock().release();
-
- }
-
- private ILock getSaveLock() {
- if (saveLock == null)
- saveLock = Platform.getJobManager().newLock();
- return saveLock;
- }
-
- /**
- *
- */
- private void handleURIChanged() {
- file = null;
- synchronizationStamp = FILE_NOT_LOADED;
- }
-
- public IFile getFile() {
- //First test to see if we should reset the file.
- if (file != null && (!file.isAccessible() || previousResourceSet != getResourceSet())) {
- file = null;
- synchronizationStamp = FILE_NOT_LOADED;
- }
- if (file == null) {
- if (isPlatformResourceURI(getURI())) {
- file = getPlatformFile(getURI());
- } else {
- //we should not be here anymore.
- file = internalGetFile(getResource());
- }
- if(null!= file && !file.isAccessible()){
- synchronizationStamp = FILE_INACCESSIBLE;
- }
- previousResourceSet = getResourceSet();
- }
- return file;
- }
-
- /**
- * @return
- */
- public long getSynchronizationStamp() {
- return synchronizationStamp;
- }
-
- /**
- * @param file
- */
- public void setFile(IFile file) {
- this.file = file;
- }
-
- /**
- * @param l
- */
- public void setSynchronizationStamp(long l) {
- synchronizationStamp = l;
- }
-
- /**
- * @see ReferencedResource#isConsistent()
- */
- public boolean isConsistent() {
- //This checks for the case where the resource hasn't finished saving fo the first time
- if(!getResource().isLoaded())
- return true;
- boolean hasLocked = false;
- try {
- hasLocked = aquireSaveLock(delay);
- } catch (InterruptedException e) {
- Logger.getLogger().write(e);
- }
- boolean result = false;
- try {
-
- if (getFile() == null || !getFile().isAccessible())
- result = true;
- else {
- if (!getFile().isSynchronized(IFile.DEPTH_ZERO))
- result = false;
- else {
- result = synchronizationStamp == computeModificationStamp(getFile());
- }
- }
- } catch (Exception e) {
- Logger.getLogger().write(e);
- } finally {
- if (hasLocked)
- releaseSaveLock();
- }
- return result;
- }
-
- public void cacheSynchronizationStamp() {
- setSynchronizationStamp(computeModificationStamp(getFile()));
- }
-
- public ReferencedResource getResource() {
- return (ReferencedResource) target;
- }
-
- public URI getURI() {
- return target == null ? null : getResource().getURI();
- }
-
- public ResourceSet getResourceSet() {
- return target == null ? null : getResource().getResourceSet();
- }
-
- public void handleUnloaded() {
- file = null;
- synchronizationStamp = FILE_NOT_LOADED;
- }
-
- public void handleLoaded() {
- cacheSynchronizationStamp();
- }
-
- public void handleSaved() {
- cacheSynchronizationStamp();
- releaseSaveLock();
- }
- }
-
- /**
- * This is an internal method to be used by the plugin only
- */
- public static synchronized void initializeFileAdapterFactory() {
- if (!fileAdapterFactoryInitialized) {
- ReferencedXMIFactoryImpl.addGlobalAdapterFactory(new FileAdapterFactory());
- fileAdapterFactoryInitialized = true;
- }
- }
-
-
- private static FileAdapter getFileAdapter(ReferencedResource res) {
- FileAdapter adapter = (FileAdapter) EcoreUtil.getExistingAdapter(res, FileAdapter.ADAPTER_KEY);
- return adapter == null ? createFileAdapter(res) : adapter;
- }
-
- private static FileAdapter createFileAdapter(ReferencedResource res) {
- FileAdapter adapter = new FileAdapter();
- adapter.setTarget(res);
- res.eAdapters().add(adapter);
- return adapter;
- }
-
- /**
- * Return the underlying IFile for the resource if one exists. This may return null if the
- * resource does not belong to a ProjectResourceSet.
- */
- public static IFile getFile(ReferencedResource res) {
- FileAdapter adapter = getFileAdapter(res);
- return adapter == null ? null : adapter.getFile();
- }
-
- public static long getSynchronizationStamp(ReferencedResource res) {
- FileAdapter adapter = getFileAdapter(res);
- return adapter == null ? FileAdapter.FILE_NOT_LOADED : adapter.getSynchronizationStamp();
- }
-
- public static void setSynhronizationStamp(ReferencedResource res, long stamp) {
- FileAdapter adapter = getFileAdapter(res);
- if (adapter != null)
- adapter.setSynchronizationStamp(stamp);
- }
-
- public static boolean isConsistent(ReferencedResource res) {
- FileAdapter adapter = getFileAdapter(res);
- return adapter != null && adapter.isConsistent();
- }
-
- /**
- * Method cacheSynchronizationStamp.
- *
- * @param r
- */
- public static void cacheSynchronizationStamp(ReferencedResource refResource) {
- if (refResource != null) {
- FileAdapter adapter = getFileAdapter(refResource);
- if (adapter != null && adapter.getSynchronizationStamp() <= FileAdapter.FILE_NOT_LOADED)
- adapter.setSynchronizationStamp(computeModificationStamp(refResource));
- }
- }
-
- public static boolean isReferencedResource(Resource aResource) {
- return REFERENCED_RES_CLASS.isInstance(aResource);
- }
-
- public static long computeModificationStamp(ReferencedResource resource) {
- FileAdapter adapter = getFileAdapter(resource);
- return adapter == null ? FileAdapter.FILE_NOT_LOADED : computeModificationStamp(adapter.getFile());
- }
-
- public static long computeModificationStamp(IFile file) {
- if (file == null)
- return FileAdapter.FILE_NOT_LOADED;
- if(!file.isAccessible()){
- return FileAdapter.FILE_INACCESSIBLE;
- }
- long currentStamp = file.getModificationStamp();
- IPath path = file.getLocation();
- if (path != null)
- return path.toFile().lastModified();
- return currentStamp;
- }
-
- /**
- * Return the IFile that currently corresponds to <code>aResource</code>.
- */
- public static IFile getFile(Resource aResource) {
- if (aResource != null) {
- if (isReferencedResource(aResource))
- return getFile((ReferencedResource) aResource);
- return internalGetFile(aResource);
- }
- return null;
- }
-
- public static IFile getFile(EObject obj) {
- if (obj == null)
- return null;
-
- Resource mofResource = obj.eResource();
- if (mofResource == null)
- return null;
- return getFile(mofResource);
- }
-
- /**
- * Get or load a cached Resource or create one if it is not found. A WrappedException will only
- * be thrown if the corresponding file exists but it failed to load.
- */
- public static Resource getOrCreateResource(URI uri, ResourceSet set) throws WrappedException {
- try {
- return set.getResource(uri, true); //this will create the resource no matter what
- } catch (WrappedException e) {
- if (ExtendedEcoreUtil.getFileNotFoundDetector().isFileNotFound(e))
- return set.getResource(uri, false);
- throw e;
- }
- }
-
- protected static boolean isSameProject(Resource resourceA, Resource resourceB) {
- IProject pA, pB;
- pA = getProject(resourceA);
- pB = getProject(resourceB);
- if (pA != null && pB != null)
- return pA.equals(pB);
- //otherwise we do not have enough info to determine false so we must return true
- return true;
- }
-
- public static IProject getProject(Resource res) {
- IProject proj = getProject(res.getResourceSet());
- if (proj == null) {
- IFile file = getFile(res);
- if (file != null)
- proj = file.getProject();
- }
- return proj;
- }
-
- /*
- * This method should not be called by clients. It is used internally by clients that also call
- * getFile(...). This is to avoid endless loops.
- *
- * @see getFile(Resource)
- */
- protected static IFile internalGetFile(Resource aResource) {
- if (aResource != null)
- return getFile(aResource.getResourceSet(), aResource.getURI());
-
- return null;
- }
-
- protected static IFile getFile(ResourceSet set, URI uri) {
- IFile file = getPlatformFile(uri);
- if (file == null) {
- if (set != null) {
- URIConverter converter = set.getURIConverter();
- URI convertedUri = converter.normalize(uri);
- if (!uri.equals(convertedUri))
- return getPlatformFile(convertedUri);
- }
- }
- return file;
- }
-
- /**
- * Return the IFile for the <code>uri</code> within the Workspace. This URI is assumed to be
- * absolute in the following format: platform:/resource/....
- */
- public static IFile getPlatformFile(URI uri) {
- if (isPlatformResourceURI(uri)) {
- String fileString = URI.decode(uri.path());
- fileString = fileString.substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
- return getWorkspace().getRoot().getFile(new Path(fileString));
- }
- return null;
- }
-
-
-
- public static IFile getFile(IProject project, URI uri) {
- ResourceSet set = getResourceSet(project);
- return getFile(set, uri);
- }
-
- /**
- * This should only be used if you want to save <code>aResource</code> within the IProject
- * that it is currently residing but you do not want to save it in the default output location.
- * You should not use this api to save a Resource to an existing file.
- *
- * @deprecated This api is no longer required. You should create a resource with the absolute
- * path (platform:/resource/...). Upon save, the file will be saved to this
- * location.
- */
- public static boolean saveResourceToFile(Resource aResource, IFile aFile) throws Exception {
- return saveResourceToFile(aResource, aFile, null);
- }
-
- /**
- * This should only be used if you want to save <code>aResource</code> within the IProject
- * that it is currently residing but you do not want to save it in the default output location.
- * You should not use this api to save a Resource to an existing file.
- *
- * @deprecated This api is no longer required. You should create a resource with the absolute
- * path (platform:/resource/...). Upon save, the file will be saved to this
- * location.
- */
- public static boolean saveResourceToFile(Resource aResource, IFile aFile, Map saveOptions) throws Exception {
- if (aResource != null && aFile != null && !aFile.exists()) {
- ResourceSet set = aResource.getResourceSet();
- if (set != null) {
- URIConverter conv = set.getURIConverter();
- if (conv != null && conv instanceof WorkbenchURIConverter) {
- WorkbenchURIConverter wbConv = (WorkbenchURIConverter) conv;
- String uri = aResource.getURI().toString();
- IPath resPath, filePath;
- resPath = new Path(uri);
- filePath = aFile.getProjectRelativePath();
- int resCount, fileCount;
- resCount = resPath.segmentCount();
- fileCount = filePath.segmentCount();
- if (resCount <= fileCount) {
- filePath = filePath.removeFirstSegments(fileCount - resCount);
- if (resPath.equals(filePath)) {
- OutputStream os = wbConv.createOutputStream(URI.createPlatformResourceURI(aFile.toString()));
- if (os != null) {
- try {
- aResource.save(os, saveOptions);
- } finally {
- os.close();
- }
- return true;
- }
- }
- }
- }
- }
- }
- return false;
- }
-
- protected static void deleteFile(IFile aFile) throws CoreException {
- if (aFile != null && aFile.exists())
- aFile.delete(true, null);
- }
-
- /**
- * Delete
- *
- * @aResource in the Workbench.
- */
- public static void deleteResource(Resource aResource) throws CoreException {
- if (aResource != null)
- deleteFile(getFile(aResource));
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryDescriptor.java
deleted file mode 100644
index e72153d..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryDescriptor.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 26, 2004
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-
-
-public class AdapterFactoryDescriptor extends AbstractRegistryDescriptor implements Comparable {
-
- private String packageURI = null;
- private String id = null;
- private Set viewIDs = null;
- private final int loadOrder;
- private static int loadOrderCounter = 0;
-
- public AdapterFactoryDescriptor(IConfigurationElement element) {
- super(element);
-
- packageURI = element.getAttribute(AdapterFactoryRegistry.PACKAGE_URI);
- id = element.getAttribute(AdapterFactoryRegistry.ID);
- Assert.isNotNull(packageURI, EMFWorkbenchEditResourceHandler.AdapterFactoryDescriptor_ERROR_0);
- Assert.isNotNull(id, EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.AdapterFactoryDescriptor_ERROR_1, new Object[]{element.getDeclaringExtension().getNamespace()}));
-
- readViewIDs();
- this.loadOrder = loadOrderCounter++;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append("AdapterFactoryDescriptor"); //$NON-NLS-1$
- sb.append('[');
- sb.append(packageURI);
- sb.append(",p"); //$NON-NLS-1$
- sb.append(getPriority());
- if (viewIDs != null && !viewIDs.isEmpty()) {
- sb.append(':');
- boolean first = true;
- Iterator iter = viewIDs.iterator();
- while (iter.hasNext()) {
- if (!first)
- sb.append(',');
- first = false;
- sb.append(iter.next());
- }
- }
- sb.append(']');
- return sb.toString();
- }
-
- private void readViewIDs() {
- viewIDs = new HashSet(3);
- IConfigurationElement[] children = element.getChildren(AdapterFactoryRegistry.VIEW);
- if (children == null || children.length == 0)
- return;
-
- String viewID = null;
- for (int i = 0; i < children.length; i++) {
- viewID = children[i].getAttribute(AdapterFactoryRegistry.ID);
- if (viewID != null)
- viewIDs.add(viewID);
- }
- }
-
- public AdapterFactory createInstance() {
- if (element == null)
- return null;
-
- AdapterFactory factory = null;
- try {
- factory = (AdapterFactory) element.createExecutableExtension(AdapterFactoryRegistry.CLASS_NAME);
- } catch (CoreException e) {
- JEMUtilPlugin.getLogger().logError(e);
- factory = null;
- }
- return factory;
- }
-
-
- public String getPackageURI() {
- return packageURI;
- }
-
- public Set getViewIDs() {
- return viewIDs;
- }
-
- public boolean appliesTo(String viewID) {
- return viewIDs.isEmpty() || viewIDs.contains(viewID);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(Object o) {
- if (this == o)
- return 0;
- if (!(o instanceof AdapterFactoryDescriptor))
- return 1;
- AdapterFactoryDescriptor desc = (AdapterFactoryDescriptor) o;
-
- int pCompare = getPriority() - desc.getPriority();
- if (pCompare != 0)
- //We have reverse the sorting of the priority for the adapter factories
- return -pCompare;
-
- //The group is the same - in this case the one for a specific view has precedence over
- //a generic one
- else if (viewIDs != null && !viewIDs.isEmpty())
- return -1;
- else
- return 1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor#getID()
- */
- public String getID() {
- return id;
- }
-
-
- /**
- * @return Returns the loadOrder.
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryRegistry.java
deleted file mode 100644
index e986962..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/AdapterFactoryRegistry.java
+++ /dev/null
@@ -1,116 +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.internal.emfworkbench.edit;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin;
-
-/**
- * @author mdelder
- */
-public class AdapterFactoryRegistry extends RegistryReader {
-
- public static final String ADAPTER_FACTORY = "adapterFactory"; //$NON-NLS-1$
-
- public static final String PACKAGE_URI = "packageURI"; //$NON-NLS-1$
-
- public static final String CLASS_NAME = "className"; //$NON-NLS-1$
-
- public static final String VIEW = "view"; //$NON-NLS-1$
-
- public static final String ID = "id"; //$NON-NLS-1$
-
- private Map descriptorMap = null;
-
- private static AdapterFactoryRegistry instance;
-
- private AdapterFactoryRegistry() {
- super(EMFWorkbenchEditPlugin.ID, EMFWorkbenchEditPlugin.ADAPTER_FACTORY_REGISTRY_EXTENSION_POINT);
- }
-
- public List getDescriptors(EPackage pkg, String viewID) {
- Collection all = getDescriptors(pkg);
- if (all == null)
- return null;
-
- Iterator iter = all.iterator();
- AdapterFactoryDescriptor desc = null;
- List result = new ArrayList(all.size());
- while (iter.hasNext()) {
- desc = (AdapterFactoryDescriptor) iter.next();
- if (desc.appliesTo(viewID))
- result.add(desc);
- }
- return result;
- }
-
- public Collection getDescriptors(EPackage registeredPackage) {
- return (Collection) getDescriptorMap().get(registeredPackage.getNsURI());
- }
-
- private Map getDescriptorMap() {
- if (descriptorMap == null)
- descriptorMap = new HashMap();
- return descriptorMap;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- try {
- if (element.getName().equals(ADAPTER_FACTORY)) {
- AdapterFactoryDescriptor descriptor = new AdapterFactoryDescriptor(element);
- mapDescriptor(descriptor);
- return true;
- }
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- }
- return false;
- }
-
- private void mapDescriptor(AdapterFactoryDescriptor descriptor) {
- String uri = descriptor.getPackageURI();
- Collection descriptors = (Collection) getDescriptorMap().get(uri);
- if (descriptors == null) {
- descriptors = new TreeSet();
- getDescriptorMap().put(uri, descriptors);
- }
- descriptors.add(descriptor);
- }
-
- /**
- * @return Returns the instance.
- */
- public static AdapterFactoryRegistry instance() {
- if (instance == null) {
- instance = new AdapterFactoryRegistry();
- instance.readRegistry();
- }
- return instance;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ChildCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ChildCommand.java
deleted file mode 100644
index 6dec40e..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ChildCommand.java
+++ /dev/null
@@ -1,103 +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.internal.emfworkbench.edit;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.wst.common.internal.emfworkbench.integration.AbstractEditModelCommand;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelCommand;
-
-/**
- * Insert the type's description here. Creation date: (05/22/01 8:57:56 AM)
- *
- * @author: Administrator
- */
-public class ChildCommand extends EditModelCommand {
- private ParentCommand parent;
- private EditModelRetriever modelRetriever;
-
- public ChildCommand(ParentCommand parentCmd, Command targetCmd, EditModelRetriever retriever) {
- super(targetCmd);
- parent = parentCmd;
- modelRetriever = retriever;
- }
-
- public boolean canExecute() {
- return true;
- }
-
- /**
- * Does nothing
- */
- public void execute() {
- //does nothing
- }
-
- protected void executeInModel(AbstractEditModelCommand cmd) {
- EditModel model = modelRetriever.getEditModelForWrite(this);
- try {
- model.getCommandStack().execute(cmd);
- model.saveIfNecessary(this);
- } finally {
- model.releaseAccess(this);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (05/22/01 9:35:36 AM)
- *
- * @return java.lang.Object
- */
- public java.lang.Object getEditModelKey() {
- return modelRetriever.getEditModelID();
- }
-
- /**
- * Insert the method's description here. Creation date: (05/22/01 9:35:36 AM)
- *
- * @return com.ibm.etools.j2ee.workbench.ParentCommand
- */
- public ParentCommand getParent() {
- return parent;
- }
-
- public void redo() {
- redoInModel();
- getParent().redoFrom(this);
- }
-
- protected void redoInModel() {
- EditModel model = modelRetriever.getEditModelForWrite(this);
- try {
- getTarget().redo();
- model.saveIfNecessary(this);
- } finally {
- model.releaseAccess(this);
- }
- }
-
- public void undo() {
- undoInModel();
- getParent().undoFrom(this);
- }
-
- protected void undoInModel() {
- EditModel model = modelRetriever.getEditModelForWrite(this);
- try {
- getTarget().undo();
- model.saveIfNecessary(this);
- } finally {
- model.releaseAccess(this);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistry.java
deleted file mode 100644
index 5f0f82d..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistry.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 6, 2003
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-
-/**
- * @author mdelder
- */
-public class ClientAccessRegistry {
-
- protected final WeakHashMap registry = new WeakHashMap();
- protected final Set baseSet = new HashSet();
-
- public synchronized void access(Object accessorKey) {
- if (isStable()) {
- if (!registry.containsKey(accessorKey)) {
- Snapshot snapshot = new Snapshot();
- this.registry.put(accessorKey, snapshot);
- this.baseSet.add(snapshot);
-
- } else
- throw new ClientAccessRegistryException(EMFWorkbenchEditResourceHandler.ClientAccessRegistry_ERROR_0, accessorKey);
-
- } else
- complain();
- }
-
- public synchronized void release(Object accessorKey) {
-
- /*
- * Error condition: Some one has been naughty and not released the resource
- */
- if (this.registry.containsKey(accessorKey) && isStable()) {
- Snapshot snapshot = (Snapshot) this.registry.remove(accessorKey);
- this.baseSet.remove(snapshot);
- } else
- complain(accessorKey);
- }
-
- public synchronized void assertAccess(Object accessorKey) {
- if (!isClientAccessing(accessorKey))
- throw new ClientAccessRegistryException(EMFWorkbenchResourceHandler.getString("ClientAccessRegistry_ERROR_1"), accessorKey); //$NON-NLS-1$
- }
-
- public synchronized boolean isClientAccessing(Object client) {
- boolean result = this.registry.containsKey(client);
- if (!isStable())
- complain();
- return result;
- }
-
- public synchronized boolean isAnyClientAccessing() {
- boolean result = this.registry.size() > 0;
- if (!isStable())
- complain();
- return result;
- }
-
- public synchronized boolean isStable() {
- return this.baseSet.size() == this.registry.size();
- }
-
- public void complain() {
- complain(null);
- }
-
- public void complain(Object accessorKey) {
- if (!isStable())
- throw new ClientAccessRegistryException(this.registry, this.baseSet);
- throw new ClientAccessRegistryException(EMFWorkbenchResourceHandler.getString("ClientAccessRegistry_ERROR_1"), accessorKey); //$NON-NLS-1$
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer("ClientAccessRegistry: ["); //$NON-NLS-1$
- result.append((isStable()) ? "STABLE" : "OUT OF SYNC"); //$NON-NLS-1$ //$NON-NLS-2$
- result.append("]: Reference Count = "); //$NON-NLS-1$
- result.append(this.size());
- return result.toString();
- }
-
- public synchronized int size() {
- return this.registry.size();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistryException.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistryException.java
deleted file mode 100644
index a5aa1cb..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ClientAccessRegistryException.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 2, 2003
- *
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-
-
-/**
- * The ClientAccessRegistryException accepts a WeakHashSet registry and a Set of all Snapshots that
- * should be contained in the registry. It will perform the necessary set difference in order to
- * determine which Snapshots exist in the baseSet but not in the registry.
- *
- * @author mdelder
- */
-public class ClientAccessRegistryException extends RuntimeException {
-
- public static final int UNKNOWN = 0;
- public static final int DANGLING_REFERENCE = 1;
- public static final int INVALID_ACCESS_KEY = 2;
- private WeakHashMap registry = null;
- private Set baseSet = null;
- private boolean processed = false;
- private int type = UNKNOWN;
-
- public ClientAccessRegistryException(WeakHashMap registry, Set baseSet) {
- this.registry = registry;
- this.baseSet = new HashSet();
- this.baseSet.addAll(baseSet);
- this.type = DANGLING_REFERENCE;
- }
-
- public ClientAccessRegistryException(String msg, Object key) {
- super(msg + " : " + key); //$NON-NLS-1$
- this.type = INVALID_ACCESS_KEY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
- */
- public void printStackTrace(PrintStream s) {
-
- s.println(toString());
- super.printStackTrace(s);
-
- if (this.registry != null) {
- Snapshot snapshot = null;
- if (!processed) {
- Object key = null;
- Iterator keyIterator = this.registry.keySet().iterator();
- while (keyIterator.hasNext()) {
- key = keyIterator.next();
- snapshot = (Snapshot) this.registry.get(key);
- this.baseSet.remove(snapshot);
- }
- processed = true;
- }
- s.println(EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.ClientAccessRegistryException_UI_0, new Object[]{new Integer(baseSet.size()).toString()}));
-
- for (Iterator possibleCulpritsItr = baseSet.iterator(); possibleCulpritsItr.hasNext();) {
- snapshot = (Snapshot) possibleCulpritsItr.next();
- snapshot.printStackTrace(s);
- }
-
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
- */
- public void printStackTrace(PrintWriter s) {
-
- s.println(toString());
- super.printStackTrace(s);
- if (this.registry != null) {
- Snapshot snapshot = null;
- if (!processed) {
- Object key = null;
- Iterator keyIterator = this.registry.keySet().iterator();
- while (keyIterator.hasNext()) {
- key = keyIterator.next();
- snapshot = (Snapshot) this.registry.get(key);
- this.baseSet.remove(snapshot);
- }
- processed = true;
- }
- s.println(EMFWorkbenchEditResourceHandler.getString("", new Object[]{new Integer(baseSet.size()).toString()})); //$NON-NLS-1$
-
- for (Iterator possibleCulpritsItr = baseSet.iterator(); possibleCulpritsItr.hasNext();) {
- snapshot = (Snapshot) possibleCulpritsItr.next();
- snapshot.printStackTrace(s);
- }
-
- }
- }
-
- public String getType() {
- switch (type) {
- case DANGLING_REFERENCE :
- return "DANGLING_REFERENCE"; //$NON-NLS-1$
- case INVALID_ACCESS_KEY :
- return "INVALID_ACCESS_KEY"; //$NON-NLS-1$
- default :
- return "UNKNOWN"; //$NON-NLS-1$
- }
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(super.toString()).append("\r\n"); //$NON-NLS-1$
- result.append(EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.ClientAccessRegistryException_UI_1, new Object[]{getType()}));
- // if (this.badReferenceLocation != null) {
- // result.append("The invalid access occurred somewhere in the following stack
- // trace.").append("\n");
- // result.append(this.badReferenceLocation.getStackTraceString());
- // }
- return result.toString();
- }
-
- public static void main(String[] args) {
- System.out.println(new ClientAccessRegistryException("test message", "-somekeyobj-").toString()); //$NON-NLS-1$ //$NON-NLS-2$
- System.out.println("LINEBREAK"); //$NON-NLS-1$
- System.out.println(new ClientAccessRegistryException(new WeakHashMap(), new HashSet()).toString());
- System.out.println("LINEBREAK"); //$NON-NLS-1$
- new ClientAccessRegistryException("test message", "-somekeyobj-").printStackTrace(); //$NON-NLS-1$ //$NON-NLS-2$
- System.out.println("LINEBREAK"); //$NON-NLS-1$
- new ClientAccessRegistryException(new WeakHashMap(), new HashSet()).printStackTrace();
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EMFWorkbenchEditContextFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EMFWorkbenchEditContextFactory.java
deleted file mode 100644
index 0a8d2f8..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EMFWorkbenchEditContextFactory.java
+++ /dev/null
@@ -1,102 +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
- *******************************************************************************/
-/*
- * Created on Mar 3, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.core.internal.jobs.LockManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.util.emf.workbench.EMFWorkbenchContextBase;
-import org.eclipse.jem.util.emf.workbench.IEMFContextContributor;
-import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ResourceSetWorkbenchEditSynchronizer;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EMFWorkbenchEditContextFactory extends EMFWorkbenchContextFactory {
-
-
- /**
- *
- */
- public EMFWorkbenchEditContextFactory() {
- super();
- }
-
- protected EMFWorkbenchContextBase primCreateEMFContext(IProject aProject) {
- return new EMFWorkbenchContext(aProject);
- }
-
- public ResourceSetWorkbenchSynchronizer createSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- return new ResourceSetWorkbenchEditSynchronizer(aResourceSet, aProject);
- }
-
- protected static LockManager lockManager = new LockManager();
- protected static Map projectLocks = new Hashtable();
-
- public static ILock getProjectLockObject(IProject aProject){
- if(null == aProject){
- return null;
- }
- Integer hashCode = new Integer(aProject.hashCode());
- synchronized (projectLocks) {
- ILock lock = (ILock)projectLocks.get(hashCode);
- if(lock == null){
- lock = lockManager.newLock();
- projectLocks.put(hashCode, lock);
- }
- return lock;
- }
- }
-
- public EMFWorkbenchContextBase createEMFContext(IProject aProject, IEMFContextContributor contributor) {
- ILock lock = getProjectLockObject(aProject);
- try{
- if(null != lock){
- lock.acquire();
- }
- return super.createEMFContext(aProject, contributor);
- } finally{
- if(null != lock){
- lock.release();
- }
- }
- }
-
- protected EMFWorkbenchContextBase getCachedEMFContext(IProject aProject) {
- ILock lock = getProjectLockObject(aProject);
- try{
- if(null != lock){
- lock.acquire();
- }
- return super.getCachedEMFContext(aProject);
- } finally{
- if(null != lock){
- lock.release();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtension.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtension.java
deleted file mode 100644
index 6041def..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtension.java
+++ /dev/null
@@ -1,69 +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
- *******************************************************************************/
-/*
- * Created on Feb 18, 2004
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.ConfigurationElementWrapper;
-
-
-public class EditModelExtension extends ConfigurationElementWrapper {
- public static final String ID_ATTR = "id"; //$NON-NLS-1$
-
- private String editModelID = null;
- private Collection resources = null;
- private String id = null;
-
-
- public EditModelExtension(IConfigurationElement element) {
- super(element);
- init();
- }
-
- private void init() {
- id = element.getAttribute(ID_ATTR);
- if (id == null) {
- Logger.getLogger().logError("Incorrect usage of editModelExtension extension point. Element must contain id attribute. Plugin: " + getPluginId()); //$NON-NLS-1$
- return;
- }
-
- editModelID = element.getAttribute(EditModelExtensionRegistry.EDIT_MODEL_ID_ATTR);
- resources = new ArrayList();
- IConfigurationElement[] editModelResources = element.getChildren(EditModelResource.EDIT_MODEL_RESOURCE_ELEMENT);
- for (int j = 0; j < editModelResources.length; j++)
- resources.add(new EditModelResource(editModelResources[j], id));
- }
-
- /**
- * @return
- */
- public String getEditModelID() {
- return editModelID;
- }
-
-
- /**
- * @return
- */
- public Collection getResources() {
- return resources;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtensionRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtensionRegistry.java
deleted file mode 100644
index 47bc51b..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelExtensionRegistry.java
+++ /dev/null
@@ -1,98 +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.internal.emfworkbench.edit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin;
-
-
-/**
- * @author mdelder
- */
-class EditModelExtensionRegistry extends RegistryReader {
-
- private static EditModelExtensionRegistry INSTANCE = null;
-
- public static final String EDIT_MODEL_EXT_ELEMENT = "editModelExtension"; //$NON-NLS-1$
- public static final String EDIT_MODEL_ID_ATTR = "editModelID"; //$NON-NLS-1$
- public static final String GROUP_ID_ATTR = "functionGroupID"; //$NON-NLS-1$
-
-
- private Map extensions = null;
-
- protected EditModelExtensionRegistry() {
- super(EMFWorkbenchEditPlugin.ID, EMFWorkbenchEditPlugin.EDIT_MODEL_EXTENSION_REGISTRY_EXTENSION_POINT);
- }
-
- public static EditModelExtensionRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new EditModelExtensionRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
-
- boolean result = false;
- Collection extensionsByID = null;
- EditModelExtension editModelExtension = null;
- if (element.getName().equals(EDIT_MODEL_EXT_ELEMENT)) {
- editModelExtension = new EditModelExtension(element);
- extensionsByID = (Collection) getExtensions().get(editModelExtension.getEditModelID());
- if (extensionsByID == null) {
- extensionsByID = new ArrayList();
- getExtensions().put(editModelExtension.getEditModelID(), extensionsByID);
- }
- extensionsByID.add(editModelExtension);
- result = true;
- }
- return result;
- }
-
- protected Map getExtensions() {
- if (extensions == null)
- extensions = new HashMap();
- return extensions;
- }
-
- /**
- * @return
- */
- public Collection getEditModelResources(Object editModelID) {
- //TODO - Cache the resources
- Collection editModelResources = new ArrayList();
- Collection editModelExtensions = (Collection) getExtensions().get(editModelID);
-
- if (editModelExtensions == null || editModelExtensions.size() == 0)
- return Collections.EMPTY_LIST;
- Iterator itr = editModelExtensions.iterator();
- while (itr.hasNext()) {
- EditModelExtension ext = (EditModelExtension) itr.next();
- editModelResources.addAll(ext.getResources());
- }
- return (!editModelExtensions.isEmpty()) ? editModelResources : Collections.EMPTY_LIST;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java
deleted file mode 100644
index facd9cb..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.IEditModelFactory;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author mdelder
- */
-public class EditModelRegistry extends RegistryReader {
-
- private final static EditModelRegistry INSTANCE = new EditModelRegistry();
-
- private final Map factoryConfigurations = new HashMap();
- private static boolean initialized = false;
-
-
- public static final String EDIT_MODEL_ELEMENT = "editModel"; //$NON-NLS-1$
- public static final String EDIT_MODEL_RESOURCE_EXTENSION = "resourceExtension"; //$NON-NLS-1$
- public static final String EDIT_MODEL_RESOURCE_EXTENSION_NAME = "name"; //$NON-NLS-1$
- public static final String EDIT_MODEL_ID_ATTR = "editModelID"; //$NON-NLS-1$
- public static final String FACTORY_CLASS_ATTR = "factoryClass"; //$NON-NLS-1$
- public static final String PARENT_MODEL_ATTR = "parentModelID"; //$NON-NLS-1$
-
-
-
- public static final String LOAD_UNKNOWN_RESOURCES_ATTR = "loadUnknownResourcesAsReadOnly"; //$NON-NLS-1$
-
- protected EditModelRegistry() {
- super(EMFWorkbenchEditPlugin.ID, EMFWorkbenchEditPlugin.EDIT_MODEL_FACTORIES_EXTENSION_POINT);
- }
-
- public static EditModelRegistry getInstance() {
- if(isInitialized())
- return INSTANCE;
- synchronized(INSTANCE) {
- if(!isInitialized()) {
- INSTANCE.readRegistry();
- initialized = true;
- }
- }
- return INSTANCE;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- /*
- * The EditModel Extension Point defines Configuration elements named "editModel" with
- * attributes "editModelID" and "factoryClass"
- */
- boolean result = false;
- if (element.getName().equals(EDIT_MODEL_ELEMENT)) {
- String editModelID = element.getAttribute(EDIT_MODEL_ID_ATTR);
- if (editModelID != null) {
- this.factoryConfigurations.put(editModelID, new EditModelInfo(editModelID, element));
- result = true;
- }
- }
- return result;
- }
-
- public String getCacheID(String editModelID, Map params) {
- IEditModelFactory factory = getEditModelFactoryByKey(editModelID);
- return factory.getCacheID(editModelID, params);
- }
-
- public EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context, Map params) {
- return getEditModelFactoryByKey(editModelID).createEditModelForRead(editModelID, context, params);
- }
-
- public EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context, Map params) {
- return getEditModelFactoryByKey(editModelID).createEditModelForWrite(editModelID, context, params);
- }
-
- public Collection getEditModelResources(String editModelID) {
- Collection resources = new TreeSet();
-
- EditModelInfo nextEditModelInfo = getEditModelInfoById(editModelID);
-
- String parentModelID = null;
- Map visitedEditModels = new HashMap();
- /* collect the resources from the parents */
- while (nextEditModelInfo != null && (parentModelID = nextEditModelInfo.getParentModelID()) != null) {
- if (visitedEditModels.containsKey(parentModelID))
- throw new IllegalStateException(EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.EditModelRegistry_ERROR_0, new Object[]{editModelID}));
- visitedEditModels.put(parentModelID, null);
- resources.addAll(getAllEditModelResources(parentModelID));
- nextEditModelInfo = getEditModelInfoById(parentModelID);
- }
-
- /* Get the resources for the actual edit model id */
- resources.addAll(getAllEditModelResources(editModelID));
-
- return resources;
- }
-
- public Collection getEditModelExtensions(String editModelID) {
- Collection extensions = new TreeSet();
-
- EditModelInfo nextEditModelInfo = getEditModelInfoById(editModelID);
-
- String parentModelID = null;
- Map visitedEditModels = new HashMap();
- /* collect the resources from the parents */
- while(nextEditModelInfo != null && (parentModelID = nextEditModelInfo.getParentModelID()) != null) {
- if(visitedEditModels.containsKey(parentModelID))
- throw new IllegalStateException(EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.EditModelRegistry_ERROR_0,new Object [] {editModelID}));
- else
- visitedEditModels.put(parentModelID, null);
-
- extensions.addAll(getAllEditModelExtensions(parentModelID));
- nextEditModelInfo = getEditModelInfoById(parentModelID);
- }
-
- /* Get the resources for the actual edit model id */
- extensions.addAll(getAllEditModelExtensions(editModelID));
-
- return extensions;
- }
-
- public IEditModelFactory findEditModelFactoryByKey(Object editModelID) {
- IEditModelFactory factory = null;
- EditModelInfo editMdlInfo = (EditModelInfo) factoryConfigurations.get(editModelID);
- if (editMdlInfo != null)
- factory = editMdlInfo.getEditModelFactory();
- return factory;
- }
-
- public IEditModelFactory findEditModelFactoryByProject(IProject project) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (Exception e) {
- return null;
- }
- if (facetedProject == null) return null;
- Iterator keys = factoryConfigurations.keySet().iterator();
- while (keys.hasNext()) {
- Object key = keys.next();
- if (key instanceof String) {
- try {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet((String)key);
- if (projectFacet != null && facetedProject.hasProjectFacet(projectFacet))
- return findEditModelFactoryByKey(key);
- } catch (Exception e) {
- continue;
- }
-
- }
- }
-
- return null;
- }
-
- protected Collection getAllEditModelResources(String editModelID) {
- Collection resources = new ArrayList();
- resources.addAll(getLocalEditModelResources(editModelID));
- resources.addAll(getExtendedEditModelResources(editModelID));
- return resources;
- }
-
- protected Collection getAllEditModelExtensions(String editModelID) {
- Collection resources = new ArrayList();
- resources.addAll(getLocalEditModelExtensions(editModelID));
- return resources;
- }
-
- protected Collection getLocalEditModelResources(String editModelID) {
- EditModelInfo editMdlInfo = getEditModelInfoById(editModelID);
- return (editMdlInfo != null) ? editMdlInfo.getEditModelResources() : Collections.EMPTY_LIST;
- }
- protected Collection getLocalEditModelExtensions(String editModelID) {
- EditModelInfo editMdlInfo = getEditModelInfoById(editModelID);
- return (editMdlInfo != null) ? editMdlInfo.getEditModelExtensions() : Collections.EMPTY_LIST;
- }
-
- protected Collection getExtendedEditModelResources(String editModelID) {
- return EditModelExtensionRegistry.getInstance().getEditModelResources(editModelID);
- }
-
- /**
- * @param editModelKey
- * the editModelID of a given EditModelFactory defined in the Extension Point
- * @throws IllegalArgumentException
- * if a IEditModelFactory cannot be found for the given ID.
- * @return the EditModelFactory associated with a given EditModelID
- */
- protected IEditModelFactory getEditModelFactoryByKey(Object editModelID) {
- IEditModelFactory factory = null;
- EditModelInfo editMdlInfo = getEditModelInfoById(editModelID);
- if (editMdlInfo != null)
- factory = editMdlInfo.getEditModelFactory();
- else
- throw new IllegalArgumentException(EMFWorkbenchEditResourceHandler.getString(EMFWorkbenchEditResourceHandler.EditModelRegistry_ERROR_2, new Object[]{editModelID}));
-
- return factory;
- }
-
- /**
- * @param editModelID
- * @return
- */
- protected EditModelInfo getEditModelInfoById(Object editModelID) {
- waitForInitializationIfNecessary();
- return (EditModelInfo) factoryConfigurations.get(editModelID);
- }
-
- /**
- * If we are not initialized, block until the INSTANCE is released ( from getInstance())
- */
- private void waitForInitializationIfNecessary() {
- /* We only need to acquire the semaphore (INSTANCE), we do not need
- * to execute anything in this block. If the Registry is not initailized,
- * then it will block until the semaphore is released (from getInstance()),
- * and then release it and return immediately.
- */
- if(!isInitialized())
- synchronized(INSTANCE) { }
- }
-
- public class EditModelInfo {
-
- private String editModelID = null;
- private IConfigurationElement configurationElement = null;
-
- private IEditModelFactory factory = null;
- private List editModelResources = null;
- private List editModelExtensions = null;
-
- private String parentModelID = null;
-
- private String tostringCache = null;
-
- public EditModelInfo(String editModelID, IConfigurationElement configurationElement) {
-
- this.configurationElement = configurationElement;
- this.editModelID = editModelID;
- this.parentModelID = this.configurationElement.getAttribute(PARENT_MODEL_ATTR);
- }
-
-
- public List getEditModelResources() {
- /* this method is guarded */
- initializeResources();
- return editModelResources;
- }
-
- public IEditModelFactory getEditModelFactory() {
-// Do not block if the factory is not null
- if (this.factory == null) {
- synchronized (this) {
- // another thread could have already initialized the factory
- // while this thread was waiting to enter the sync block
- if(this.factory == null) {
- if (this.configurationElement != null) {
- try {
- this.factory = (IEditModelFactory) this.configurationElement.createExecutableExtension(FACTORY_CLASS_ATTR);
- Boolean value = Boolean.valueOf(this.configurationElement.getAttribute(LOAD_UNKNOWN_RESOURCES_ATTR));
- this.factory.setLoadKnownResourcesAsReadOnly(value.booleanValue());
- discardConfigurationElementIfNecessary();
- } catch (CoreException e) {
- Logger.getLogger(EMFWorkbenchEditPlugin.ID).logError(e);
- }
- } else {
- Logger.getLogger().logError(EMFWorkbenchEditResourceHandler.EditModelRegistry_ERROR_1);
- }
- }
- }
- }
- return this.factory;
- }
-
- private synchronized void initializeResources() {
-
- if (editModelResources == null) {
- if (configurationElement != null) {
-
- editModelResources = new ArrayList();
-
- IConfigurationElement[] resources = configurationElement.getChildren(EditModelResource.EDIT_MODEL_RESOURCE_ELEMENT);
- IConfigurationElement[] resExtensions = configurationElement.getChildren(EDIT_MODEL_RESOURCE_EXTENSION);
- // set the configurationElement to null- keeps code from reentering
- discardConfigurationElementIfNecessary();
- for (int j = 0; j < resources.length; j++) {
- editModelResources.add(new EditModelResource(resources[j]));
- }
- if (resExtensions == null || resExtensions.length == 0) {
- editModelExtensions = Collections.EMPTY_LIST;
- } else {
- editModelExtensions = new ArrayList();
- for (int i = 0; i < resExtensions.length; i++) {
- String extension = resExtensions[i].getAttribute(EDIT_MODEL_RESOURCE_EXTENSION_NAME);
- editModelExtensions.add(extension);
- }
- }
- } else {
- editModelResources = Collections.EMPTY_LIST;
- editModelExtensions = Collections.EMPTY_LIST;
- }
- }
- }
-
- private void discardConfigurationElementIfNecessary() {
- if (this.editModelResources != null && this.factory != null)
- this.configurationElement = null;
- }
-
- public String toString() {
- if (tostringCache == null)
- tostringCache = "EditModelID: {" + this.editModelID + "}, Parent Model ID {" + this.parentModelID + "}, Configuration Element: [" + this.configurationElement + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
- return tostringCache;
- }
-
- /**
- * @return Returns the parentModelID.
- */
- public String getParentModelID() {
- return parentModelID;
- }
-
- public List getEditModelExtensions() {
- /* this method is guarded */
- initializeResources();
- return editModelExtensions;
- }
-
- }
- /**
- * @return Returns the initialized.
- */
- protected static boolean isInitialized() {
- return initialized;
- }
-
- public String[] getRegisteredEditModelIDs() {
- return (String[]) factoryConfigurations.keySet().toArray(new String[factoryConfigurations.keySet().size()]);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
deleted file mode 100644
index b5543ac..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelResource.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Feb 5, 2004
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor;
-
-
-
-public class EditModelResource extends AbstractRegistryDescriptor implements Comparable {
- public static final String EDIT_MODEL_URI_ATTR = "URI"; //$NON-NLS-1$
- public static final String AUTO_LOAD_ATTR = "autoload"; //$NON-NLS-1$
- public static final String EDIT_MODEL_RESOURCE_ELEMENT = "editModelResource"; //$NON-NLS-1$
-
- private static int loadOrderCounter = 1;
- private URI uri;
- private boolean autoload = false;
- //Indicates if this was defined as part of the edit model,
- //as opposed to an extension
- private boolean isCore = true;
-
- private String extensionID;
-
- private int loadOrder;
-
- public EditModelResource(IConfigurationElement element) {
- super(element);
- String strUri = element.getAttribute(EDIT_MODEL_URI_ATTR);
- if (strUri != null)
- EditModelResource.this.uri = URI.createURI(strUri);
-
- String strLoad = element.getAttribute(AUTO_LOAD_ATTR);
- if (strLoad != null)
- autoload = Boolean.valueOf(strLoad).booleanValue();
- loadOrder = loadOrderCounter++;
- }
-
- public EditModelResource(IConfigurationElement element, String extensionID) {
- this(element);
- this.extensionID = extensionID;
- isCore = false;
- }
-
- public URI getURI() {
- return uri;
- }
-
- public boolean isAutoLoad() {
- return autoload;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor#getID()
- */
- public String getID() {
- return extensionID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor#getPriority()
- */
- public int getPriority() {
- if (isCore)
- return 0;
- return super.getPriority();
- }
-
- /**
- * return whether this resource is defined as part of the edit model definition as opposed to an
- * extension
- */
- public boolean isCore() {
- return isCore;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(Object o) {
- if (!(o instanceof EditModelResource))
- return 1;
- EditModelResource res = (EditModelResource) o;
- int value = getPriority() - res.getPriority();
- if (value == 0)
- return loadOrder - res.loadOrder;
- return value;
- }
-
- /**
- * @return Returns the loadOrder.
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
deleted file mode 100644
index 8efb8c1..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRetriever.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.Map;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-
-
-public class EditModelRetriever {
- private EMFWorkbenchContext context;
- private String editModelID;
- private Map editModelParms;
-
- /**
- * EditModelRetriever constructor comment.
- */
- public EditModelRetriever(EMFWorkbenchContext context, String editModelKey, Map parms) {
- super();
- this.context = context;
- editModelID = editModelKey;
- editModelParms = parms;
- }
-
- public EditModel getEditModelForRead(Object accessorKey) {
- return context.getEditModelForRead(getEditModelID(), accessorKey, editModelParms);
- }
-
- public EditModel getEditModelForWrite(Object accessorKey) {
- return context.getEditModelForWrite(getEditModelID(), accessorKey, editModelParms);
- }
-
- public String getEditModelID() {
- return editModelID;
- }
-
- public EMFWorkbenchContext context() {
- return context;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ExtendedComposedAdapterFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ExtendedComposedAdapterFactory.java
deleted file mode 100644
index 8f26cf3..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ExtendedComposedAdapterFactory.java
+++ /dev/null
@@ -1,103 +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
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExtendedComposedAdapterFactory extends ComposedAdapterFactory {
-
- /**
- * @param adapterFactory
- */
- public ExtendedComposedAdapterFactory(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * @param adapterFactories
- */
- public ExtendedComposedAdapterFactory(AdapterFactory[] adapterFactories) {
- super(adapterFactories);
- }
-
- /**
- * @param adapterFactories
- */
- public ExtendedComposedAdapterFactory(Collection adapterFactories) {
- super(adapterFactories);
- }
-
- /*
- * overrode from the super class, changed not to check supertypes of the EObject, because that
- * will be handled by the DynamicAdapterFactory
- *
- * @see org.eclipse.emf.common.notify.AdapterFactory#adapt(org.eclipse.emf.common.notify.Notifier,
- * java.lang.Object)
- */
- public Adapter adapt(Notifier target, Object type) {
- Adapter result = null;
-
- if (target instanceof EObject) {
- EObject eObject = (EObject) target;
- EClass eClass = eObject.eClass();
- if (eClass != null) {
- EPackage ePackage = eClass.getEPackage();
- Collection types = new ArrayList();
- types.add(ePackage);
- if (type != null) {
- types.add(type);
- }
- /* when an error occurs, remove the delegate and try again */
- boolean attemptAdaptAgain = true;
- while (result == null && attemptAdaptAgain) {
- attemptAdaptAgain = false;
- AdapterFactory delegateAdapterFactory = getFactoryForTypes(types);
- if (delegateAdapterFactory != null) {
- try {
- result = delegateAdapterFactory.adapt(target, type);
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- adapterFactories.remove(delegateAdapterFactory);
- attemptAdaptAgain = true;
- }
- }
- }
- }
- } else {
- result = adapt(target, type, new HashSet(), target.getClass());
- }
-
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/InvertedCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/InvertedCommand.java
deleted file mode 100644
index 2bbcb11..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/InvertedCommand.java
+++ /dev/null
@@ -1,68 +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.internal.emfworkbench.edit;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.wst.common.internal.emfworkbench.integration.AbstractEditModelCommand;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelCommand;
-
-/**
- * Insert the type's description here. Creation date: (05/22/01 8:58:24 AM)
- *
- * @author: Administrator
- */
-public class InvertedCommand extends AbstractEditModelCommand {
- public InvertedCommand(Command targetCommand) {
- super(targetCommand);
- }
-
- public boolean canExecute() {
- return getTarget().canUndo();
- }
-
- public boolean canUndo() {
- return getTarget().canExecute();
- }
-
- /**
- * Does nothing
- */
- public void execute() {
- //does nothing
- }
-
- /**
- * getEditModelCommand method comment.
- */
- public EditModelCommand getEditModelCommand() {
- return ((AbstractEditModelCommand) getTarget()).getEditModelCommand();
- }
-
- protected int inversionDepth() {
- if (getEditModelCommand() == getTarget())
- return 1;
- return ((InvertedCommand) getTarget()).inversionDepth() + 1;
- }
-
- protected String labelPrefix() {
- return inversionDepth() % 2 == 1 ? "Undo " : "Redo ";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public void redo() {
- getTarget().undo();
- }
-
- public void undo() {
- getTarget().redo();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ParentCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ParentCommand.java
deleted file mode 100644
index 9c7dc90..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ParentCommand.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.internal.emfworkbench.integration.AbstractEditModelCommand;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ComposedEditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelCommand;
-
-/**
- * Insert the type's description here. Creation date: (05/22/01 8:57:38 AM)
- *
- * @author: Administrator
- */
-public class ParentCommand extends EditModelCommand {
- private List children;
- private ComposedEditModel editModel;
- private List affectedModels;
-
- public ParentCommand(Command targetCommand, ComposedEditModel anEditModel) {
- super(targetCommand);
- editModel = anEditModel;
- children = new ArrayList(1);
- }
-
- public boolean canExecute() {
- return getTarget().canExecute();
- }
-
- protected void computeAffectedModels() {
- ResourceSet set = null;
- List editModels = getEditModel().getChildren();
- Iterator it = computeAffectedResourceSets().iterator();
- while (it.hasNext()) {
- set = (ResourceSet) it.next();
- for (int i = 0; i < editModels.size(); i++) {
- EditModel model = (EditModel) editModels.get(i);
- if (model.getResourceSet() == set) {
- getAffectedModels().add(new EditModelRetriever(model.getEmfContext(), model.getEditModelID(), model.getParams()));
- continue;
- }
- }
- }
- }
-
- protected Set computeAffectedResourceSets() {
- Iterator objects = getTarget().getAffectedObjects().iterator();
- Set resourceSets = new HashSet();
- Object o = null;
- EObject ref = null;
- ResourceSet set = null;
- while (objects.hasNext()) {
- o = objects.next();
- if (!(o instanceof EObject))
- continue;
- ref = (EObject) o;
- if (ref.eResource() != null) {
- set = ref.eResource().getResourceSet();
- if (set != null)
- resourceSets.add(set);
- }
- }
- return resourceSets;
- }
-
- protected ChildCommand createChildCommand(EditModelRetriever retriever) {
- return new ChildCommand(this, getTarget(), retriever);
- }
-
- public void execute() {
- getTarget().execute();
- computeAffectedModels();
- pushChildrenForExecute();
- }
-
- protected void executeInModel(AbstractEditModelCommand cmd) {
- getEditModel().getCommandStack().execute(cmd);
- }
-
- protected List getAffectedModels() {
- if (affectedModels == null)
- affectedModels = new ArrayList(1);
- return affectedModels;
- }
-
- protected List getChildren() {
- return children;
- }
-
- protected ComposedEditModel getEditModel() {
- return editModel;
- }
-
- protected void invertChildren() {
- invertChildrenExcept((ChildCommand) null);
- }
-
- protected void invertChildrenExcept(ChildCommand caller) {
- for (int i = 0; i < children.size(); i++) {
- ChildCommand childCmd = (ChildCommand) children.get(i);
- if (caller == null || childCmd != caller)
- childCmd.invertAndPush();
- }
- }
-
- protected void invertFrom(ChildCommand caller) {
- invertAndPush();
- invertChildrenExcept(caller);
- }
-
- protected void pushChildrenForExecute() {
- for (int i = 0; i < getAffectedModels().size(); i++) {
- EditModelRetriever retriever = (EditModelRetriever) getAffectedModels().get(i);
- ChildCommand command = createChildCommand(retriever);
- getChildren().add(command);
- command.executeInModel(command);
- }
- }
-
- public void redo() {
- getTarget().redo();
- invertChildren();
- }
-
- public void redoFrom(ChildCommand child) {
- invertFrom(child);
- }
-
- public void undo() {
- getTarget().undo();
- invertChildren();
- }
-
- public void undoFrom(ChildCommand child) {
- invertFrom(child);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ReadOnlyClientAccessRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ReadOnlyClientAccessRegistry.java
deleted file mode 100644
index e845428..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/ReadOnlyClientAccessRegistry.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-
-/**
- * This is a readonly version of the editmodel access registry, only uses a weak hash dictionary,
- * and because the access is read only, is less concerned with timing of access/release, and will be
- * cleaned up on garbage collection if needed.
- *
- */
-public class ReadOnlyClientAccessRegistry extends ClientAccessRegistry {
-
- public ReadOnlyClientAccessRegistry() {
- super();
- }
-
- public synchronized void access(Object accessorKey) {
- if (!registry.containsKey(accessorKey)) {
- this.registry.put(accessorKey, null);
- } else
- throw new ClientAccessRegistryException(EMFWorkbenchEditResourceHandler.ClientAccessRegistry_ERROR_0, accessorKey);
- }
-
- public synchronized void release(Object accessorKey) {
-
- /*
- * Error condition: Some one has been naughty and not released the resource
- */
- if (this.registry.containsKey(accessorKey)) {
- this.registry.remove(accessorKey);
- } else
- complain(accessorKey);
- }
-
- public void complain(Object accessorKey) {
-
- throw new ClientAccessRegistryException(EMFWorkbenchResourceHandler.getString("ClientAccessRegistry_ERROR_1"), accessorKey); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/Snapshot.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/Snapshot.java
deleted file mode 100644
index a2b64b4..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/Snapshot.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 3, 2003
- *
- */
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-
-
-/**
- * The Snapshot is used to remember the call stack trace of any method that accesses a Resource.
- *
- * @author mdelder
- */
-public class Snapshot extends RuntimeException {
-
- public Snapshot() {
- super(EMFWorkbenchEditResourceHandler.Snapshot_ERROR_0);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Throwable#printStackTrace()
- */
- public String getStackTraceString() {
- StringWriter writer = new StringWriter();
- PrintWriter printWriter = new PrintWriter(writer);
- super.printStackTrace(printWriter);
- return writer.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/WrappingCommandStack.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/WrappingCommandStack.java
deleted file mode 100644
index bf15371..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/WrappingCommandStack.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.edit;
-
-
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ComposedEditModel;
-
-/**
- * Insert the type's description here. Creation date: (05/21/01 9:31:02 PM)
- *
- * @author: Administrator
- */
-public class WrappingCommandStack extends BasicCommandStack {
- private ComposedEditModel editModel;
-
- /**
- * WrappingCommandStack constructor comment.
- */
- public WrappingCommandStack(ComposedEditModel anEditModel) {
- super();
- editModel = anEditModel;
- }
-
- public void execute(Command command) {
- ParentCommand parent = new ParentCommand(command, editModel);
- super.execute(parent);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
deleted file mode 100644
index 7061e7d..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/AbstractEditModelCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.wst.common.internal.emfworkbench.edit.InvertedCommand;
-
-
-public abstract class AbstractEditModelCommand extends AbstractCommand {
- private Command target;
- private AbstractEditModelCommand owner;
-
- protected AbstractEditModelCommand() {
- super();
- }
-
- public AbstractEditModelCommand(Command targetCommand) {
- super();
- target = targetCommand;
- }
-
- public abstract EditModelCommand getEditModelCommand();
-
- protected AbstractEditModelCommand getOutermostCommand() {
- return owner == null ? this : owner.getOutermostCommand();
- }
-
- protected Command getOwner() {
- return owner;
- }
-
- public Command getTarget() {
- return target;
- }
-
- /**
- * Creates a new inverted command on the outermost command
- */
- public InvertedCommand inverted() {
- AbstractEditModelCommand outer = getOutermostCommand();
- InvertedCommand cmd = new InvertedCommand(outer);
- outer.setOwner(cmd);
- return cmd;
- }
-
- protected void setOwner(AbstractEditModelCommand ownerCommand) {
- owner = ownerCommand;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedAccessorKey.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedAccessorKey.java
deleted file mode 100644
index 70cac1e..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedAccessorKey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-
-/**
- * @author Administrator
- *
- *
- */
-public class ComposedAccessorKey {
-
- private Object accessorKey = null;
- private Object addonKey = null;
-
-
- public static ComposedAccessorKey getComposedAccessorKey(Object accessorKey, ComposedEditModel editModel) {
- ComposedAccessorKey newKey = new ComposedAccessorKey(accessorKey, editModel);
- editModel.cacheAccessorKey(newKey);
- return newKey;
- }
-
-
- private ComposedAccessorKey(Object accessorKey, Object addonKey) {
- this.accessorKey = accessorKey;
- this.addonKey = addonKey;
- }
-
- public boolean equals(Object other) {
- if (other == null || !(other instanceof ComposedAccessorKey))
- return false;
- ComposedAccessorKey otherKey = (ComposedAccessorKey) other;
-
- return accessorKey.equals(otherKey.accessorKey) && addonKey.equals(otherKey.addonKey);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return accessorKey.hashCode() ^ addonKey.hashCode();
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedEditModel.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedEditModel.java
deleted file mode 100644
index e46fa9a..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ComposedEditModel.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.edit.WrappingCommandStack;
-
-/**
- * Insert the type's description here. Creation date: (05/21/01 8:26:32 PM)
- *
- * @author: Administrator
- */
-public class ComposedEditModel extends EditModel implements EditModelListener {
-
- private List children = null;
- private Map childrenMap = null;
- private List cachedKeys = new ArrayList();
-
- /**
- * ComposedEditModel constructor comment.
- */
- public ComposedEditModel(String editModelID, EMFWorkbenchContext context) {
- super(editModelID, context, false);
- }
-
-
- public void createChildrenIfNecessary(ComposedAccessorKey composedAccessorKey) {
- //do nothing
- }
-
- /**
- * @param newKey
- */
- public void cacheAccessorKey(ComposedAccessorKey newKey) {
- if (!cachedKeys.contains(newKey))
- cachedKeys.add(newKey);
- }
-
- // Is this necessary anymore? The only diff seems to be it doesn't release resources
-// public void dispose() {
-// disposing = true;
-// if (commandStack != null)
-// commandStack.removeCommandStackListener(this);
-// if (hasListeners())
-// notifyListeners(new EditModelEvent(EditModelEvent.PRE_DISPOSE, this));
-// releasePreloadResources();
-// releaseIdentifiers();
-// emfContext = null;
-// resources = null;
-// disposing = false;
-// project = null;
-// cachedKeys = new ArrayList();
-// }
-
- public EditModel.Reference addChild(String editModelID, Map params, Object accessorKey) {
- return addChild(editModelID, params, ComposedAccessorKey.getComposedAccessorKey(accessorKey, this));
- }
-
- public EditModel.Reference addChild(String editModelID, Map params, ComposedAccessorKey composedAccessorKey) {
-
- EditModel editModel = getEmfContext().getEditModelForWrite(editModelID, composedAccessorKey, params);
- editModel.addListener(this);
-
- getChildrenMap().put(editModel.getReference(), editModel);
- getChildren().add(editModel);
-
- return editModel.getReference();
- }
-
- public void removeChild(EditModel.Reference reference, Object accessorKey) {
- ComposedAccessorKey composedAccessorKey = ComposedAccessorKey.getComposedAccessorKey(accessorKey, this);
- EditModel editModel = (EditModel) getChildrenMap().remove(reference);
- if (editModel != null) {
- editModel.releaseAccess(composedAccessorKey);
- editModel.removeListener(this);
- getChildren().remove(editModel);
- }
- }
-
- public Iterator getContainedReferences() {
- return getChildrenMap().keySet().iterator();
- }
-
- public EditModel getContainedEditModel(EditModel.Reference reference) {
- return (EditModel) getChildrenMap().get(reference);
- }
-
- /**
- * Return the CommandStack.
- */
- protected BasicCommandStack createCommandStack() {
- return new WrappingCommandStack(this);
- }
-
- /**
- * Forward all events to the listeners for this model
- */
- public void editModelChanged(EditModelEvent anEvent) {
- if (hasListeners())
- notifyListeners(anEvent);
- }
-
- public Set getAffectedFiles() {
- Set aSet = new HashSet();
- List models = getChildren();
- for (int i = 0; i < models.size(); i++) {
- EditModel child = (EditModel) models.get(i);
- aSet.addAll(child.getAffectedFiles());
- }
- return aSet;
- }
-
- public List getChildren() {
- if (children == null)
- children = new ArrayList();
- return children;
- }
-
- protected Map getChildrenMap() {
- if (childrenMap == null)
- childrenMap = new HashMap();
- return childrenMap;
- }
-
- /**
- * Pass along to children.
- */
- protected void handleSaveIfNecessaryDidNotSave(IProgressMonitor monitor) {
- List list = getChildren();
- EditModel editModel;
- for (int i = 0; i < list.size(); i++) {
- editModel = (EditModel) list.get(i);
- editModel.handleSaveIfNecessaryDidNotSave(monitor);
- }
- }
-
- /**
- * Return whether a save is needed on the CommandStack
- */
- public boolean isDirty() {
- Iterator editModels = getChildren().iterator();
- while (editModels.hasNext()) {
- EditModel editModel = (EditModel) editModels.next();
- if (editModel.isDirty())
- return true;
- }
- return false;
- }
-
- public boolean isReadOnly() {
- return false;
- }
-
- /**
- * Return whether a save is needed on the CommandStack
- */
- public boolean isInterrestedInResource(Resource aResource) {
- Iterator editModels = getChildren().iterator();
- while (editModels.hasNext()) {
- EditModel editModel = (EditModel) editModels.next();
- if (editModel.isInterrestedInResource(aResource))
- return true;
- }
- return false;
- }
-
- public void primSave(IProgressMonitor monitor) {
- List list = getChildren();
- for (int i = 0; i < list.size(); i++)
- ((EditModel) list.get(i)).primSave(monitor);
- }
-
- /**
- * This only increments the reference count of the children and should only be called if you
- * know what you are doing.
- */
- public void access(Object accessorKey) {
- ComposedAccessorKey composedAccessorKey = ComposedAccessorKey.getComposedAccessorKey(accessorKey, this);
- if (getChildren().size() == 0) {
- createChildrenIfNecessary(composedAccessorKey);
- } else {
-
- List tempchildren = getChildren();
- for (int i = 0; i < tempchildren.size(); i++) {
- EditModel model = (EditModel) tempchildren.get(i);
- model.access(composedAccessorKey);
- }
- }
- // removing for defect 1978, children should do all the accessing
- super.access(accessorKey);
-
- }
-
- /**
- * This method should be called from each client when they are finished working with the
- * EditModel.
- */
- public void releaseAccess(Object accessorKey) {
- List tempchildren = getChildren();
- ComposedAccessorKey composedAccessorKey = ComposedAccessorKey.getComposedAccessorKey(accessorKey, this);
- for (int i = 0; i < tempchildren.size(); i++) {
- EditModel model = (EditModel) tempchildren.get(i);
- model.releaseAccess(composedAccessorKey);
- }
- removeKeyFromCache(composedAccessorKey);
- // Removing this call... Children should be able to handle all releasing defect 1978
- super.releaseAccess(accessorKey);
- }
-
- public void removeKeyFromCache(ComposedAccessorKey key) {
- cachedKeys.remove(key);
- }
-
- /**
- * If one should save, they all should save.
- */
- protected boolean shouldSave() {
- List list = getChildren();
- EditModel editModel;
- for (int i = 0; i < list.size(); i++) {
- editModel = (EditModel) list.get(i);
- if (editModel.shouldSave())
- return true;
- }
- return false;
- }
-
- /**
- * If one should save, they all should save.
- */
- protected boolean shouldSave(IOperationHandler operationHandler) {
- List list = getChildren();
- EditModel editModel;
- for (int i = 0; i < list.size(); i++) {
- editModel = (EditModel) list.get(i);
- if (editModel.shouldSave(operationHandler))
- return true;
- }
- return false;
- }
-
- /**
- * @see com.ibm.etools.j2ee.workbench.EditModel#getNonResourceFiles()
- */
- public List getNonResourceFiles() {
- List list = getChildren();
- List result = new ArrayList();
- EditModel editModel;
- for (int i = 0; i < list.size(); i++) {
- editModel = (EditModel) list.get(i);
- List files = editModel.getNonResourceFiles();
- if (files != null && !files.isEmpty())
- result.addAll(files);
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/CompoundingCommandStack.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/CompoundingCommandStack.java
deleted file mode 100644
index 188a889..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/CompoundingCommandStack.java
+++ /dev/null
@@ -1,152 +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
- *******************************************************************************/
-/*
- * Created on Nov 26, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-
-
-/**
- * @author DABERG
- *
- * This class does not actually execute any commands. It merely gathers the commands to be executed
- * and compounds them so that they can be executed against the actualCommandStack.
- */
-public class CompoundingCommandStack implements CommandStack {
- private CommandStack actualCommandStack;
- private Command compoundCommand;
-
- /**
- *
- */
- public CompoundingCommandStack(CommandStack actualCommandStack) {
- this.actualCommandStack = actualCommandStack;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#execute(org.eclipse.emf.common.command.Command)
- */
- public void execute(Command command) {
- if (compoundCommand == null)
- compoundCommand = command;
- else
- compoundCommand = compoundCommand.chain(command);
- }
-
- public void performExecution() {
- if (compoundCommand != null) {
- try {
- actualCommandStack.execute(compoundCommand);
- } finally {
- compoundCommand = null;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#canUndo()
- */
- public boolean canUndo() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#undo()
- */
- public void undo() {
- //default
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#canRedo()
- */
- public boolean canRedo() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#getUndoCommand()
- */
- public Command getUndoCommand() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#getRedoCommand()
- */
- public Command getRedoCommand() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#getMostRecentCommand()
- */
- public Command getMostRecentCommand() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#redo()
- */
- public void redo() {
- //redo
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#flush()
- */
- public void flush() {
- //flush
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#addCommandStackListener(org.eclipse.emf.common.command.CommandStackListener)
- */
- public void addCommandStackListener(CommandStackListener listener) {
- //default
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStack#removeCommandStackListener(org.eclipse.emf.common.command.CommandStackListener)
- */
- public void removeCommandStackListener(CommandStackListener listener) {
- //default
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/DynamicAdapterFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/DynamicAdapterFactory.java
deleted file mode 100644
index 37571ee..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/DynamicAdapterFactory.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementManager;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchEditResourceHandler;
-import org.eclipse.wst.common.internal.emfworkbench.edit.AdapterFactoryDescriptor;
-import org.eclipse.wst.common.internal.emfworkbench.edit.AdapterFactoryRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.edit.ExtendedComposedAdapterFactory;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DynamicAdapterFactory implements AdapterFactory, IChangeNotifier, IDisposable, INotifyChangedListener, IEnablementIdentifierListener {
-
- private static final AdapterFactory NULL_FACTORY = new AdapterFactoryImpl();
-
- private ResourceItemProviderAdapterFactory resourceItemProviderAdapterFactory = null;
-
- private String viewID;
-
- //Each of the two maps below are keyed by the project
- private Map adapterFactoriesByPackage;
-
- private Map adapterFactoriesByType;
-
- private Set allFactories;
-
- /**
- * This is used to implement {@link IChangeNotifier}
- */
- protected ChangeNotifier changeNotifier = new ChangeNotifier();
-
- private boolean respectingActivities = false;
-
- protected static final Object NO_PROJECT = "NO_PROJECT"; //$NON-NLS-1$
-
- /**
- */
- public DynamicAdapterFactory(String viewID, boolean respectActivies) {
- this.viewID = viewID;
- this.respectingActivities = respectActivies;
- initialize();
- }
-
- /**
- */
- public DynamicAdapterFactory(String viewID) {
- this.viewID = viewID;
- initialize();
- }
-
- private void initialize() {
- adapterFactoriesByPackage = new HashMap();
- adapterFactoriesByType = new HashMap();
- allFactories = new HashSet();
- }
-
- public boolean isFactoryForType(Object type) {
- return getFactoryForType(type) != null;
- }
-
- private AdapterFactory getFactoryForType(Object type) {
-
- if (type == null)
- return null;
-
- if (type instanceof EObject)
- return getFactoryForType((EObject) type);
-
- Object aProject = ProjectUtilities.getProject(type);
- if (aProject == null)
- aProject = NO_PROJECT;
- AdapterFactory factory = getExistingFactoryForType(aProject, type);
- if (factory == NULL_FACTORY)
- return null;
- else if (factory == null) {
- factory = findFactoryForType(aProject, type);
-
- if (factory == null)
- addAdapterFactory(aProject, type, NULL_FACTORY);
- else
- addAdapterFactory(aProject, type, factory);
- }
- return factory;
- }
-
- private AdapterFactory getExistingFactoryForType(Object p, Object type) {
- if (p == null)
- return null;
- Map aMap = (Map) adapterFactoriesByType.get(p);
- if (aMap == null)
- return null;
- return (AdapterFactory) adapterFactoriesByType.get(type);
- }
-
- /*
- * The factory was not cached by type, so we will search the cache of factories for the project
- * and see if it can be found there
- */
- private AdapterFactory findFactoryForType(Object project, Object type) {
- if (project == null)
- return null;
- Map aMap = (Map) adapterFactoriesByPackage.get(project);
- if (aMap == null)
- return null;
- Iterator iter = aMap.values().iterator();
- AdapterFactory factory = null;
- while (iter.hasNext()) {
- factory = (AdapterFactory) iter.next();
- if (factory.isFactoryForType(type))
- return factory;
- }
-
- // adapt the resource to its contents
- if (getResourceItemProviderAdapterFactory().isFactoryForType(type))
- return getResourceItemProviderAdapterFactory();
- return null;
- }
-
- private AdapterFactory getFactoryForType(EObject obj) {
- EClass eClass = obj.eClass();
- if (eClass == null)
- return null;
-
- EPackage ePackage = eClass.getEPackage();
- Object aProject = ProjectUtilities.getProject(obj);
- if (aProject == null)
- aProject = NO_PROJECT;
- AdapterFactory result = getFactoryForPackage(aProject, ePackage);
-
- if (result == null) {
- Set failedPackageSet = new HashSet();
- failedPackageSet.add(ePackage);
- Iterator supertypes = eClass.getEAllSuperTypes().iterator();
- while (supertypes.hasNext()) {
- eClass = (EClass) supertypes.next();
- if (eClass != null) {
- ePackage = eClass.getEPackage();
- if (failedPackageSet.add(ePackage)) {
- result = getFactoryForPackage(aProject, ePackage);
- if (result != null)
- break;
- }
- }
- }
- }
- return result;
- }
-
- private AdapterFactory getFactoryForPackage(Object aProject, EPackage aPackage) {
- if (aProject == null || aPackage == null)
- return null;
- AdapterFactory factory = getExistingFactoryForPackage(aProject, aPackage);
- if (factory == NULL_FACTORY)
- return null;
- else if (factory == null) {
- try {
- factory = createAdapterFactory(aProject, aPackage);
-
- if (factory == null)
- addAdapterFactory(aProject, aPackage, NULL_FACTORY);
- else
- addAdapterFactory(aProject, aPackage, factory);
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- }
- }
- return factory;
- }
-
- private AdapterFactory getFactoryForTypes(Object p, List types) {
- Map aMap = (Map) adapterFactoriesByPackage.get(p);
- if (aMap == null)
- return adaptResourceTypes(types);
-
- Iterator factories = aMap.values().iterator();
- AdapterFactory factory = null;
- while (factories.hasNext()) {
- factory = (AdapterFactory) factories.next();
- if (isFactoryForAllTypes(factory, types)) {
- return factory;
- }
- }
-
-
- return null;
- }
-
- private AdapterFactory adaptResourceTypes(List types) {
- // adapt the resource to its contents
- if (isFactoryForAllTypes(getResourceItemProviderAdapterFactory(), types))
- return getResourceItemProviderAdapterFactory();
- return null;
- }
-
- private void removeFactoryForTypes(Object p, List types) {
- Map aMap = (Map) adapterFactoriesByPackage.get(p);
- if (aMap == null)
- return;
- Iterator factories = aMap.values().iterator();
- AdapterFactory factory = null;
- while (factories.hasNext()) {
- factory = (AdapterFactory) factories.next();
- if (isFactoryForAllTypes(factory, types)) {
- aMap.remove(factory);
- }
- }
-
- }
-
- private boolean isFactoryForAllTypes(AdapterFactory factory, List types) {
- for (int i = 0; i < types.size(); i++) {
- if (!factory.isFactoryForType(types.get(i))) {
- return false;
- }
- }
- return true;
-
- }
-
- private AdapterFactory getExistingFactoryForPackage(Object p, EPackage aPackage) {
- if (p == null)
- return null;
- Map aMap = (Map) adapterFactoriesByPackage.get(p);
- if (aMap == null)
- return null;
- return (AdapterFactory) aMap.get(aPackage);
- }
-
- private void addAdapterFactory(Object p, EPackage aPackage, AdapterFactory adapterFactory) {
- Map aMap = getOrCreateMap(p, adapterFactoriesByPackage);
-
- aMap.put(aPackage, adapterFactory);
-
- if (adapterFactory == NULL_FACTORY)
- return;
-
- if (adapterFactory instanceof IChangeNotifier) {
- ((IChangeNotifier) adapterFactory).addListener(this);
- }
- allFactories.add(adapterFactory);
- }
-
- private Map getOrCreateMap(Object p, Map container) {
- Map aMap = (Map) container.get(p);
- if (aMap == null) {
- aMap = new HashMap(10);
- container.put(p, aMap);
- }
- return aMap;
- }
-
- private void addAdapterFactory(Object p, Object type, AdapterFactory adapterFactory) {
- Map aMap = getOrCreateMap(p, adapterFactoriesByType);
- aMap.put(type, adapterFactory);
-
- if (adapterFactory == NULL_FACTORY)
- return;
-
- if (adapterFactory instanceof IChangeNotifier) {
- ((IChangeNotifier) adapterFactory).addListener(this);
- }
- allFactories.add(adapterFactory);
- }
-
- public Object adapt(Object target, Object type) {
- Object adapter = target;
- if (target instanceof Notifier) {
- adapter = adapt((Notifier) target, type);
- }
-
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
-
- return null;
- }
-
- public Adapter adapt(Notifier target, Object type) {
- Adapter result = null;
-
- if (target instanceof EObject)
- result = adapt((EObject) target, type);
- else {
- Object p = ProjectUtilities.getProject(target);
- if (p == null)
- p = NO_PROJECT;
- result = adapt(p, target, type, new HashSet(), target.getClass());
-
- }
-
- return result;
- }
-
- public Adapter adapt(EObject target, Object type) {
-
- EClass eClass = target.eClass();
- if (eClass == null)
- return null;
-
- EPackage ePackage = eClass.getEPackage();
- Adapter result = adapt(target, ePackage, type);
-
- if (result == null) {
- Set failedPackageSet = new HashSet();
- failedPackageSet.add(ePackage);
- Iterator supertypes = eClass.getEAllSuperTypes().iterator();
- while (supertypes.hasNext()) {
- eClass = (EClass) supertypes.next();
- if (eClass != null) {
- ePackage = eClass.getEPackage();
- if (failedPackageSet.add(ePackage)) {
- result = adapt(target, ePackage, type);
- if (result != null)
- break;
- }
- }
- }
- }
- return result;
- }
-
- private Adapter adapt(EObject target, EPackage ePackage, Object type) {
- Object aProject = ProjectUtilities.getProject(target);
- if (aProject == null)
- aProject = NO_PROJECT;
- AdapterFactory delegate = getFactoryForPackage(aProject, ePackage);
- if (delegate != null && delegate.isFactoryForType(type)) {
- return delegate.adapt(target, type);
- }
-
- return null;
- }
-
- /*
- * Code borrowed from {@link ComposedAdapterFactory}
- *
- */
- private Adapter adapt(Object p, Notifier target, Object type, Collection failedPackages, Class javaClass) {
- if (p == null)
- return null;
-
- Adapter result = null;
-
- Package javaPackage = javaClass.getPackage();
- if (failedPackages.add(javaPackage)) {
- List types = new ArrayList(2);
- types.add(javaPackage);
- if (type != null) {
- types.add(type);
- }
-
- /* when an error occurs, remove the delegate and try again */
- boolean attemptAdaptAgain = true;
- while (result == null && attemptAdaptAgain) {
- attemptAdaptAgain = false;
-
- AdapterFactory delegateAdapterFactory = getFactoryForTypes(p, types);
- if (delegateAdapterFactory != null) {
- try {
- result = delegateAdapterFactory.adapt(target, type);
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- removeFactoryForTypes(p, types);
- attemptAdaptAgain = true;
- }
- }
- }
- }
-
- if (result == null) {
- Class superclass = javaClass.getSuperclass();
- if (superclass != null) {
- result = adapt(p, target, type, failedPackages, javaClass.getSuperclass());
- }
- if (result == null) {
- Class[] interfaces = javaClass.getInterfaces();
- for (int i = 0; i < interfaces.length; ++i) {
- result = adapt(p, target, type, failedPackages, interfaces[i]);
- if (result != null) {
- break;
- }
- }
- }
- }
-
- return result;
- }
-
- public Adapter adaptNew(Notifier target, Object type) {
-
- AdapterFactory factory = getFactoryForType(target);
-
- if (factory != null)
- return factory.adaptNew(target, type);
- return null;
- }
-
- public void adaptAllNew(Notifier target) {
-
- AdapterFactory factory = getFactoryForType(target);
-
- if (factory != null)
- factory.adaptAllNew(target);
-
- }
-
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.add(notifyChangedListener);
- }
-
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.remove(notifyChangedListener);
- }
-
- public void fireNotifyChanged(Notification notification) {
- if (changeNotifier == null || changeNotifier.isEmpty() || changeNotifier.get(0) == null)
- return;
- changeNotifier.fireNotifyChanged(notification);
- }
-
- public void dispose() {
- Iterator iter = allFactories.iterator();
- Object factory = null;
- while (iter.hasNext()) {
- factory = iter.next();
- disposeFactory(factory);
- }
- for (Iterator itr = getEnablementIdentifiers().iterator(); itr.hasNext();) {
- ((IEnablementIdentifier) itr.next()).removeIdentifierListener(this);
- }
- if (resourceItemProviderAdapterFactory != null)
- resourceItemProviderAdapterFactory.removeListener(this);
- }
-
- private void disposeFactory(Object factory) {
- if (factory instanceof IDisposable) {
- ((IDisposable) factory).dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.INotifyChangedListener#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification notification) {
- //Foward the notification on to all my listeners
- fireNotifyChanged(notification);
- }
-
- /**
- * @param project
- */
- private void removeAdapterFactories(Object project) {
- adapterFactoriesByType.remove(project);
- Map aMap = (Map) adapterFactoriesByPackage.remove(project);
- if (aMap == null)
- return;
-
- Iterator factories = aMap.values().iterator();
- Object adapterFactory;
- while (factories.hasNext()) {
- adapterFactory = factories.next();
- allFactories.remove(adapterFactory);
- disposeFactory(adapterFactory);
- }
- }
-
- private AdapterFactory createAdapterFactory(Object project, EPackage ePackage) {
- if (ePackage == null)
- throw new IllegalArgumentException(EMFWorkbenchEditResourceHandler.DynamicAdapterFactory_ERROR_0);
-
- return createAdapterFactory(project, AdapterFactoryRegistry.instance().getDescriptors(ePackage, viewID));
-
- }
-
- private AdapterFactory createAdapterFactory(Object project, List descriptors) {
- if (descriptors == null || descriptors.isEmpty())
- return null;
-
- AdapterFactory fact = null;
- IEnablementIdentifier identifier = null;
- AdapterFactoryDescriptor desc = null;
- if (descriptors.size() == 1) {
- desc = (AdapterFactoryDescriptor) descriptors.get(0);
- identifier = getIdentifier(project, desc);
- addListenerIfNecessary(identifier);
- if (project.equals(NO_PROJECT) || (identifier != null && identifier.isEnabled()))
- return desc.createInstance();
- return null;
- }
- List factories = new ArrayList(descriptors.size());
- for (int i = 0; i < descriptors.size(); i++) {
- desc = (AdapterFactoryDescriptor) descriptors.get(i);
- identifier = getIdentifier(project, desc);
- addListenerIfNecessary(identifier);
- if (project.equals(NO_PROJECT) || (identifier != null && identifier.isEnabled())) {
- fact = desc.createInstance();
- if (fact != null)
- factories.add(fact);
- }
- }
- if (factories.isEmpty())
- return null;
-
- return new ExtendedComposedAdapterFactory(factories);
- }
-
- /**
- * @param project
- * @param desc
- * @return
- */
- private IEnablementIdentifier getIdentifier(Object project, AdapterFactoryDescriptor desc) {
- IEnablementIdentifier identifier = null;
- if (isRespectingActivities() && project instanceof IProject)
- identifier = IEnablementManager.INSTANCE.getIdentifier(desc.getID(), (IProject) project);
- else if (project instanceof IProject)
- identifier = EnablementManager.INSTANCE.getIdentifier(desc.getID(), (IProject) project);
- return identifier;
- }
-
- /**
- * @return
- */
- private boolean isRespectingActivities() {
- return respectingActivities;
- }
-
- protected void addListenerIfNecessary(IEnablementIdentifier identifier) {
- if (identifier == null)
- return;
- identifier.addIdentifierListener(this);
- getEnablementIdentifiers().add(identifier);
- }
-
- protected boolean isListeningTo(IEnablementIdentifier identifier) {
- return getEnablementIdentifiers().contains(identifier);
- }
-
- /**
- * @return Returns the enablementIdentifiers.
- */
- protected Set getEnablementIdentifiers() {
- if (enablementIdentifiers == null)
- enablementIdentifiers = new HashSet();
- return enablementIdentifiers;
- }
-
- private Set enablementIdentifiers;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
- */
- public void identifierChanged(EnablementIdentifierEvent identifierEvent) {
- if (identifierEvent.hasEnabledChanged() || identifierEvent.hasFunctionGroupIdsChanged()) {
- Object project = ((EnablementIdentifier) identifierEvent.getIdentifier()).getProject();
- if (project != null) {
- removeAdapterFactories(project);
- /*
- * final Notifier notifier = (Notifier) getCachedRoots().get(project);
- */
- /* force a viewer refresh */
- notifyChanged(new NotificationImpl(Notification.ADD, null, null) {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getNotifier()
- */
- public Object getNotifier() {
- return null; // notifier;
- }
- });
- }
- /* else replace entire structure */
- }
- }
-
- /**
- * @return Returns the resourceItemProviderAdapterFactory.
- */
- public ResourceItemProviderAdapterFactory getResourceItemProviderAdapterFactory() {
- if (resourceItemProviderAdapterFactory == null) {
- resourceItemProviderAdapterFactory = new ResourceItemProviderAdapterFactory();
- resourceItemProviderAdapterFactory.addListener(this);
- }
- return resourceItemProviderAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EMFWorkbenchEditPlugin.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EMFWorkbenchEditPlugin.java
deleted file mode 100644
index e409b3b..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EMFWorkbenchEditPlugin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emfworkbench.PassthruResourceSet;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EMFWorkbenchEditPlugin extends Plugin {
- public static final String ID = "org.eclipse.wst.common.emfworkbench.integration"; //$NON-NLS-1$
-
- public static final String EDIT_MODEL_FACTORIES_EXTENSION_POINT = "editModel"; //$NON-NLS-1$
- public static final String EDIT_MODEL_EXTENSION_REGISTRY_EXTENSION_POINT = "editModelExtension"; //$NON-NLS-1$
- public static final String ADAPTER_FACTORY_REGISTRY_EXTENSION_POINT = "adapterFactory"; //$NON-NLS-1$
-
-
- //The shared instance.
- private static EMFWorkbenchEditPlugin plugin;
-
- /**
- * The constructor.
- */
- public EMFWorkbenchEditPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static EMFWorkbenchEditPlugin getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- ExtendedEcoreUtil.setFileNotFoundDetector(new ExtendedEcoreUtil.FileNotFoundDetector() {
- public boolean isFileNotFound(WrappedException wrappedEx) {
- return WorkbenchResourceHelperBase.isResourceNotFound(wrappedEx) || wrappedEx.exception() instanceof FileNotFoundException;
- }
- });
- WorkbenchResourceHelper.initializeFileAdapterFactory();
- }
-
- public static ResourceSet createIsolatedResourceSet(IProject project) {
- return new PassthruResourceSet(project);
- }
-
- public static ResourceSet createWorkspacePassthruResourceSet() {
- return new PassthruResourceSet();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java
deleted file mode 100644
index d22d645..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java
+++ /dev/null
@@ -1,1612 +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.internal.emfworkbench.integration;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerRegister;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.IWFTWrappedException;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.PleaseMigrateYourCodeError;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.edit.ClientAccessRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelResource;
-import org.eclipse.wst.common.internal.emfworkbench.edit.ReadOnlyClientAccessRegistry;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateInputProvider;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-
-public class EditModel implements CommandStackListener, ResourceStateInputProvider, ResourceStateValidator, IEnablementIdentifierListener {
-
- protected BasicCommandStack commandStack;
- protected final ListenerList listeners = new ListenerList();
-
- private Map params;
- private final String editModelID;
- private final boolean readOnly;
- // These are the current resource uris we need to track
- protected List knownResourceUris;
- // These are the current resource extensions to track
- protected List knownResourceExtensions;
- // This is a subset of the known resource uris, which we have requested be autoloaded
- protected List preloadResourceUris;
- // This is a map of identifiers to resources that we need to listen to in order to listen for
- // updates to the edit model resources
- protected Map resourceIdentifiers;
-
- protected EditModelEvent dirtyModelEvent;
- protected boolean isNotifing = false;
- protected boolean disposing = false;
- private boolean disposed = false;
- protected ResourceStateValidator stateValidator;
- protected boolean accessAsReadForUnKnownURIs;
- protected ResourceAdapter resourceAdapter = new ResourceAdapter();
- protected boolean isReverting = false;
- protected List resources;
- private ClientAccessRegistry registry;
- protected EMFWorkbenchContext emfContext = null;
- protected IProject project = null;
-
- private Reference reference;
- private List resourcesTargetedForTermination;
-
- protected class ResourceAdapter extends AdapterImpl {
- public void notifyChanged(Notification notification) {
- if (!isDisposing() && notification.getEventType() == Notification.SET && notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
- resourceIsLoadedChanged((Resource) notification.getNotifier(), notification.getOldBooleanValue(), notification.getNewBooleanValue());
- }
- }
- }
-
- public EditModel(String editModelID, EMFWorkbenchContext context, boolean readOnly) {
- if (context == null)
- throw new IllegalStateException("EMF context can't be null"); //$NON-NLS-1$
- this.editModelID = editModelID;
- this.readOnly = readOnly;
- if (readOnly)
- this.registry = new ReadOnlyClientAccessRegistry();
- else
- this.registry = new ClientAccessRegistry();
- this.emfContext = context;
- this.project = context.getProject();
- initializeKnownResourceUris();
- processLoadedResources();
- processPreloadResources();
- }
-
- public EditModel(String editModelID, EMFWorkbenchContext context, boolean readOnly, boolean accessUnknownResourcesAsReadOnly) {
- this(editModelID, context, readOnly);
- this.accessAsReadForUnKnownURIs = accessUnknownResourcesAsReadOnly;
- }
-
- /**
- * @return editModelID
- */
- public String getEditModelID() {
- return editModelID;
- }
-
- public boolean isDisposing() {
- return disposing;
- }
-
-
- /**
- * Subclasses should not override this method. This method will be made
- * final in the next release. Subclasses should override doDispose() as
- * necessary to dispose any additional artifacts.
- */
- public void dispose() {
- try {
- if (disposing || disposed)
- return;
- disposing = true;
-
- if (hasListeners())
- notifyListeners(new EditModelEvent(EditModelEvent.PRE_DISPOSE, this));
-
- releaseResources();
-
- if (commandStack != null)
- commandStack.removeCommandStackListener(this);
- if (getEmfContext() != null)
- getEmfContext().removeEditModel(this, isReadOnly());
- releasePreloadResources();
- releaseIdentifiers();
- doDispose();
- } catch (RuntimeException re) {
- Logger.getLogger().logError(re);
- } finally {
- emfContext = null;
- resources = null;
- project = null;
- disposed = true;
- disposing = false;
- }
- }
-
- /**
- * Subclasses should override as necessary
- */
- protected void doDispose() {
- }
-
- protected void releaseIdentifiers() {
- if (resourceIdentifiers == null)
- return;
- Iterator iter = resourceIdentifiers.keySet().iterator();
- IEnablementIdentifier identifier = null;
- while (iter.hasNext()) {
- identifier = (IEnablementIdentifier) iter.next();
- identifier.removeIdentifierListener(this);
- }
- }
-
- private ResourceSetWorkbenchSynchronizer getResourceSetSynchronizer() {
- if (emfContext == null || !emfContext.hasResourceSet())
- return null;
- return getEmfContext().getResourceSet().getSynchronizer();
- }
-
- protected void releasePreloadResources() {
- ResourceSetWorkbenchEditSynchronizer sync = (ResourceSetWorkbenchEditSynchronizer) getResourceSetSynchronizer();
- if (sync != null) {
- for (int i = 0; i < preloadResourceUris.size(); i++) {
- URI uri = (URI) preloadResourceUris.get(i);
- sync.disableAutoload(uri);
- }
- for (int i = 0; i < knownResourceExtensions.size(); i++) {
- String ext = (String) knownResourceExtensions.get(i);
- sync.disableAutoload(ext);
- }
- }
- }
-
-
- /** ** BEGIN Command Stack Manipulation *** */
-
- /**
- * Return the CommandStack.
- */
- protected BasicCommandStack createCommandStack() {
- BasicCommandStack stack = new BasicCommandStack();
- return stack;
- }
-
- /**
- * This is called with the {@linkorg.eclipse.emf.common.command.CommandStack}'s state has changed.
- */
- public void commandStackChanged(java.util.EventObject event) {
- if (dirtyModelEvent == null)
- dirtyModelEvent = new EditModelEvent(EditModelEvent.DIRTY, this);
- if (hasListeners())
- notifyListeners(dirtyModelEvent);
- }
-
- /**
- * Flush the Commands from the CommandStack.
- */
- protected void flushCommandStack() {
- getCommandStack().flush();
- getCommandStack().saveIsDone();
- }
-
- /**
- * Return the CommandStack.
- */
- public BasicCommandStack getCommandStack() {
- if (commandStack == null) {
- commandStack = createCommandStack();
- commandStack.addCommandStackListener(this);
- }
- return commandStack;
- }
-
- /**
- * Returns true if there are any listeners
- */
- public boolean hasListeners() {
- return !listeners.isEmpty();
- }
-
- /** ** END Command Stack Manipulation *** */
-
- /** ** BEGIN Listeners *** */
-
- /**
- * Add
- *
- * @aListener to the list of listeners.
- */
- public void addListener(EditModelListener aListener) {
- if (aListener != null)
- listeners.add(aListener);
- }
-
- /**
- * Notify listeners of
- *
- * @anEvent.
- */
- protected void notifyListeners(final EditModelEvent anEvent) {
-
- NotifyRunner notifier = new NotifyRunner(anEvent);
-
- Object[] notifyList = listeners.getListeners();
- for (int i = 0; i < notifyList.length; i++) {
- notifier.setListener( (EditModelListener) notifyList[i] );
- SafeRunner.run(notifier);
- }
- }
-
- /**
- * Remove
- *
- * @aListener from the list of listeners.
- */
- public boolean removeListener(EditModelListener aListener) {
- listeners.remove(aListener);
- return true;
- }
-
- /** ** END Listeners *** */
-
- protected void makeFileEditable(IFile aFile) {
- if (aFile == null)
- return;
- aFile.getResourceAttributes().setReadOnly(false);
- }
-
- /**
- * @return java.util.List of IFile; any read-only files that will be touched if this edit model
- * saves
- */
- public List getReadOnlyAffectedFiles() {
- Iterator affected = getAffectedFiles().iterator();
- List result = new ArrayList();
- while (affected.hasNext()) {
- IFile aFile = (IFile) affected.next();
- if (aFile.isReadOnly())
- result.add(aFile);
- }
- return result;
- }
-
- /** ** BEGIN Save Handlers *** */
-
- protected ISaveHandler getSaveHandler() {
- return SaveHandlerRegister.getSaveHandler();
- }
-
- /**
- * Default is to do nothing. This method is called if a saveIfNecessary or
- * saveIfNecessaryWithPrompt determines not to save. This provides subclasses with an
- * opportunity to do some other action.
- */
- protected void handleSaveIfNecessaryDidNotSave(IProgressMonitor monitor) {
- // do nothing
- }
-
- /**
- * This will force all of the referenced Resources to be saved.
- */
- public void save(Object accessorKey) {
- save(null, accessorKey);
- }
-
- /**
- * This will force all of the referenced Resources to be saved.
- */
- public void save(IProgressMonitor monitor) throws PleaseMigrateYourCodeError {
- // save
- }
-
- /**
- * Subclasses may override {@link #primSave}
- */
- public final void save(IProgressMonitor monitor, Object accessorKey) {
- assertPermissionToSave(accessorKey);
- getSaveHandler().access();
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primSave(aMonitor);
- }
- };
- runSaveOperation(runnable, monitor);
- } catch (SaveFailedException ex) {
- getSaveHandler().handleSaveFailed(ex, monitor);
- } catch (Exception ex) {
- ex.printStackTrace();
- } finally {
- getSaveHandler().release();
- }
- }
-
- /**
- * Save only resources that need to be saved (i.e., no other references).
- */
- public void saveIfNecessary(Object accessorKey) {
- saveIfNecessary(null, accessorKey);
- }
-
- /**
- * Save only resources that need to be saved (i.e., no other references).
- */
- public void saveIfNecessary(IProgressMonitor monitor, Object accessorKey) {
- if (shouldSave())
- save(monitor, accessorKey);
- else
- handleSaveIfNecessaryDidNotSave(monitor);
- }
-
- /**
- * Save only if necessary. If typically a save would not occur because this edit model is
- * shared, the user will be prompted using the
- *
- * @operationHandler. If the prompt returns true (the user wants to save) the entire edit model
- * will be saved.
- */
- public void saveIfNecessaryWithPrompt(IOperationHandler operationHandler, Object accessorKey) {
- saveIfNecessaryWithPrompt(null, operationHandler, accessorKey);
- }
-
- /**
- * Save only if necessary. If typically a save would not occur because this edit model is
- * shared, the user will be prompted using the
- *
- * @operationHandler. If the prompt returns true (the user wants to save) the entire edit model
- * will be saved. You may pass in a boolean <code>wasDirty</code> to
- * indicate whether this edit model was dirty prior to making any changes and
- * calling this method. {@link EditModel#isDirty()}
- */
- public void saveIfNecessaryWithPrompt(IOperationHandler operationHandler, boolean wasDirty, Object accessorKey) {
- saveIfNecessaryWithPrompt(null, operationHandler, wasDirty, accessorKey);
- }
-
- /**
- * Save only if necessary. If typically a save would not occur because this edit model is
- * shared, the user will be prompted using the
- *
- * @operationHandler. If the prompt returns true (the user wants to save) the entire edit model
- * will be saved.
- */
- public void saveIfNecessaryWithPrompt(IProgressMonitor monitor, IOperationHandler operationHandler, Object accessorKey) {
- saveIfNecessaryWithPrompt(monitor, operationHandler, true, accessorKey);
- }
-
- /**
- * Save only if necessary. If typically a save would not occur because this edit model is
- * shared, the user will be prompted using the
- *
- * @operationHandler. If the prompt returns true (the user wants to save) the entire edit model
- * will be saved. You may pass in a boolean <code>wasDirty</code> to
- * indicate whether this edit model was dirty prior to making any changes and
- * calling this method. {@link EditModel#isDirty()}
- */
- public void saveIfNecessaryWithPrompt(IProgressMonitor monitor, IOperationHandler operationHandler, boolean wasDirty, Object accessorKey) {
-
- if (shouldSave(operationHandler, wasDirty))
- save(monitor, accessorKey);
- else
- handleSaveIfNecessaryDidNotSave(monitor);
- }
-
- protected void assertPermissionToSave(Object accessorKey) {
- if (registry != null)
- registry.assertAccess(accessorKey);
- }
-
- protected void runSaveOperation(IWorkspaceRunnable runnable, IProgressMonitor monitor) throws SaveFailedException {
- try {
- ResourcesPlugin.getWorkspace().run(runnable, ResourcesPlugin.getWorkspace().getRoot(), IWorkspace.AVOID_UPDATE, monitor);
- } catch (CoreException e) {
- throw new SaveFailedException(e);
- }
- }
-
- /**
- * Should the resources be saved.
- */
- protected boolean shouldSave(IOperationHandler operationHandler, boolean wasDirty) {
- return !wasDirty ? shouldSave() : shouldSave(operationHandler);
- }
-
- /**
- * Return true if the uri for
- *
- * @aResource is one of the known resource uris.
- */
- public boolean isInterrestedInResource(Resource aResource) {
- return isInterrestedInResourceUri(aResource.getURI());
- }
-
- protected boolean isInterrestedInResourceUri(URI resURI) {
- URI uri;
- List uriStrings = getKnownResourceUris();
- for (int i = 0; i < uriStrings.size(); i++) {
- uri = (URI) uriStrings.get(i);
- if (ExtendedEcoreUtil.endsWith(resURI, uri))
- return true;
- }
- return false;
- }
-
-
- /**
- * Subclasses should override and add URIs (type URI) of known resources. You must add resources
- * that have references to other known resources first so they will be released first.
- */
- protected void initializeKnownResourceUris() {
- knownResourceUris = new ArrayList();
- preloadResourceUris = new ArrayList();
- EditModelResource res = null;
- Collection editModelResources = EditModelRegistry.getInstance().getEditModelResources(getEditModelID());
- Iterator iter = editModelResources.iterator();
- while (iter.hasNext()) {
- res = (EditModelResource) iter.next();
- addEditModelResource(res);
- }
- Collection resourceExtensions = EditModelRegistry.getInstance().getEditModelExtensions(getEditModelID());
- /* bug 170690 - initialize knownResourceExtensions if necessary, and change reference from iter to it */
- if (knownResourceExtensions == null)
- {
- knownResourceExtensions = new ArrayList();
- }
- if (!resourceExtensions.isEmpty())
- {
- knownResourceExtensions.addAll(resourceExtensions);
- Iterator it = resourceExtensions.iterator();
- ResourceSetWorkbenchEditSynchronizer sync = (ResourceSetWorkbenchEditSynchronizer) getEmfContext().getResourceSet().getSynchronizer();
- while (it.hasNext()) {
- sync.enableAutoload(it.next().toString());
- }
- }
- }
-
- private void addEditModelResource(EditModelResource res) {
- boolean enabled = false;
- try {
- if (res.isCore()) {
- enabled = true;
- } else {
- IEnablementIdentifier identifier = res.getEnablementIdentifier(getProject());
- registerInterest(identifier, res);
- enabled = identifier.isEnabled();
- }
- } catch (RuntimeException re) {
- Logger.getLogger().logWarning(re);
- }
- if (enabled) {
- URI uri = res.getURI();
- knownResourceUris.add(uri);
- if (res.isAutoLoad()) {
- ResourceSetWorkbenchEditSynchronizer sync = (ResourceSetWorkbenchEditSynchronizer) getEmfContext().getResourceSet().getSynchronizer();
- sync.enableAutoload(uri);
- preloadResourceUris.add(uri);
- }
- }
- }
-
- /**
- * @param res
- */
- private void registerInterest(IEnablementIdentifier identifier, EditModelResource res) {
- getEditModelResources(identifier).add(res);
- }
-
- private List getEditModelResources(IEnablementIdentifier identifier) {
- if (resourceIdentifiers == null)
- resourceIdentifiers = new HashMap();
- List tResources = (List) resourceIdentifiers.get(identifier);
- if (tResources == null) {
- tResources = new ArrayList(3);
- resourceIdentifiers.put(identifier, tResources);
- identifier.addIdentifierListener(this);
- }
- return tResources;
- }
-
-
-
- public java.util.List getKnownResourceUris() {
- if (knownResourceUris == null)
- initializeKnownResourceUris();
-
- return knownResourceUris;
- }
-
- public boolean isShared() {
- return registry.size() > 1;
- }
-
- /**
- * @see ResourceStateInputProvider#cacheNonResourceValidateState(List)
- */
- public void cacheNonResourceValidateState(List roNonResourceFiles) {
- // do nothing
- }
-
- /**
- * @see ResourceStateInputProvider#getNonResourceFiles()
- */
- public List getNonResourceFiles() {
- return null;
- }
-
- /**
- * @see ResourceStateInputProvider#getNonResourceInconsistentFiles()
- */
- public List getNonResourceInconsistentFiles() {
- return null;
- }
-
- /**
- * Gets the stateValidator.
- *
- * @return Returns a ResourceStateValidator
- */
- public ResourceStateValidator getStateValidator() {
- if (stateValidator == null)
- stateValidator = createStateValidator();
- return stateValidator;
- }
-
- /**
- * Method createStateValidator.
- *
- * @return ResourceStateValidator
- */
- private ResourceStateValidator createStateValidator() {
- return new ResourceStateValidatorImpl(this);
- }
-
- /**
- * @see ResourceStateValidator#checkActivation(ResourceStateValidatorPresenter)
- */
- public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().checkActivation(presenter);
- }
-
- /**
- * @see ResourceStateValidator#lostActivation(ResourceStateValidatorPresenter)
- */
- public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().lostActivation(presenter);
- }
-
- /**
- * @see ResourceStateValidator#validateState(ResourceStateValidatorPresenter)
- */
- public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
- if (presenter == null)
- return Status.OK_STATUS;
- return getStateValidator().validateState(presenter);
- }
-
- /**
- * @see ResourceStateValidator#checkSave(ResourceStateValidatorPresenter)
- */
- public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
- return getStateValidator().checkSave(presenter);
- }
-
- /**
- * @see ResourceStateValidator#checkReadOnly()
- */
- public boolean checkReadOnly() {
- return getStateValidator().checkReadOnly();
- }
-
- /**
- * Return the ResourceSet from the Nature.
- *
- * @return org.eclipse.emf.ecore.resource.ResourceSet
- */
- public ResourceSet getResourceSet() {
- ResourceSet resourceSet = null;
- if (getEmfContext() != null)
- resourceSet = getEmfContext().getResourceSet();
- return resourceSet;
- }
-
- protected void resourceIsLoadedChanged(Resource aResource, boolean oldValue, boolean newValue) {
- if (!isReverting && !disposing && hasListeners()) {
- int eventCode = newValue ? EditModelEvent.LOADED_RESOURCE : EditModelEvent.UNLOADED_RESOURCE;
- EditModelEvent evt = new EditModelEvent(eventCode, this);
- evt.addResource(aResource);
- notifyListeners(evt);
- }
- }
-
- public Resource getResource(URI aUri) {
- Resource res = getAndLoadLocalResource(aUri);
- if (res == null)
- res = WorkbenchResourceHelper.getOrCreateResource(aUri, getResourceSet());
- if (res != null)
- processResource(res);
- return res;
- }
-
- protected void processResource(Resource aResource) {
- if (aResource != null && !getResources().contains(aResource)) {
- if (aResource instanceof ReferencedResource) {
- access((ReferencedResource) aResource);
- // We need a better way to pass this through the save options instead.
- // We also need to make this dynamic based on the project target
- ((ReferencedResource) aResource).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- } else if (aResource instanceof CompatibilityXMIResource) {
- ((CompatibilityXMIResource) aResource).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- }
-
- addResource(aResource);
- }
- }
-
- protected void addResource(Resource aResource) {
- getResources().add(aResource);
- aResource.eAdapters().add(resourceAdapter);
- }
-
- /**
- * Return a Resource for
- *
- * @aUri.
- */
- // TODO The following method will only use the last segment when looking for a resource.
- protected Resource getResource(List tResources, URI aUri) {
- Resource resource;
- for (int i = 0; i < tResources.size(); i++) {
- resource = (Resource) tResources.get(i);
- if (ExtendedEcoreUtil.endsWith(resource.getURI(), aUri))
- return resource;
- }
- return null;
- }
-
- public Resource createResource(URI uri) {
- Resource resource = getExistingOrCreateResource(uri);
- processResource(resource);
- return resource;
- }
-
- /**
- * Get a cached Resource, either local or in the ResourceSet, before creating a Resource. This
- * api handles the case that the Resource may be created during a demand load that failed.
- */
- public Resource getExistingOrCreateResource(URI uri) {
- Resource res = getAndLoadLocalResource(uri);
- if (res == null)
- res = WorkbenchResourceHelperBase.getExistingOrCreateResource(uri, getResourceSet());
- return res;
- }
-
- /**
- * Return a Resource for
- *
- * @aUri.
- */
- protected Resource getAndLoadLocalResource(URI aUri) {
- Resource resource = getLocalResource(aUri);
- if (null != resource && !resource.isLoaded()) {
- try {
- resource.load(Collections.EMPTY_MAP); // reload it
- } catch (IOException e) {
- // Ignore
- }
- }
- return resource;
- }
-
- /**
- * Return a Resource for
- *
- * @aUri.
- */
- protected Resource getLocalResource(URI aUri) {
- return getResource(getResources(), aUri);
- }
-
- /*
- * Return true if this is a ReadOnly EditModel or if we should only access unknown URIs as
- * ReadOnly.
- */
- protected boolean shouldAccessForRead(ReferencedResource aResource) {
- return isReadOnly() || (accessAsReadForUnKnownURIs && !isInterrestedInResource(aResource));
- }
-
- /**
- * Save only resources that need to be saved (i.e., no other references).
- */
- public void resourceChanged(EditModelEvent anEvent) {
- int code = anEvent.getEventCode();
- switch (code) {
- case EditModelEvent.REMOVED_RESOURCE : {
- if (!isReverting && hasResourceReference(anEvent.getChangedResources()))
- removeResources(anEvent.getChangedResources());
- else
- return;
- break;
- }
- case EditModelEvent.ADDED_RESOURCE :
- if (!processResourcesIfInterrested(anEvent.getChangedResources()))
- return;
- }
- if (hasListeners()) {
- anEvent.setEditModel(this);
- notifyListeners(anEvent);
- }
- }
-
- /**
- * Return true if aResource is referenced by me.
- */
- protected boolean hasResourceReference(Resource aResource) {
- if (aResource != null)
- return getResources().contains(aResource);
- return false;
- }
-
- /**
- * Return true if any Resource in the list of
- *
- * @resources is referenced by me.
- */
- protected boolean hasResourceReference(List tResources) {
- for (int i = 0; i < tResources.size(); i++) {
- if (hasResourceReference((Resource) tResources.get(i)))
- return true;
- }
- return false;
- }
-
- /**
- * Remove reference to the Resource objects in
- *
- * @aList. This should be called when one or more Resource objects are removed from the
- * ResourceSet without the reference count going to zero.
- */
- protected void removeResources(List aList) {
- Resource res;
- for (int i = 0; i < aList.size(); i++) {
- res = (Resource) aList.get(i);
- if (removeResource(res) && res instanceof ReferencedResource)
- removedResource((ReferencedResource) res);
- }
- }
-
- private final void removedResource(ReferencedResource referencedResource) {
- if (!isReadOnly() && referencedResource.wasReverted()) {
- isReverting = true;
- try {
- reverted(referencedResource);
- } finally {
- isReverting = false;
- }
- }
- }
-
- protected boolean removeResource(URI uri) {
- Resource res = getLocalResource(uri);
- return removeResource(res);
- }
-
- /**
- * Remove reference to the aResource.
- */
- protected boolean removeResource(Resource aResource) {
- if (aResource != null) {
- aResource.eAdapters().remove(resourceAdapter);
- return getResources().remove(aResource);
- }
- return false;
- }
-
- /**
- * Subclasses should override to post process a removed ReferencedResource.
- *
- * @see J2EEEditModel#revertAllResources()
- */
- protected void reverted(ReferencedResource revertedResource) {
- revertAllResources();
- }
-
- protected void revertAllResources() {
- List someResources = getSortedResources();
- for (int i = 0; i < someResources.size(); i++)
- ((Resource) someResources.get(i)).unload();
- getResources().removeAll(someResources);
- for (int i = 0; i < someResources.size(); i++)
- ((Resource) someResources.get(i)).eAdapters().remove(resourceAdapter);
- }
-
- /**
- * group the resources by XMI first, then XML
- */
- protected List getSortedResources() {
-
- List theResources = getResources();
- int size = theResources.size();
- if (size == 0)
- return Collections.EMPTY_LIST;
- Resource[] sorted = new Resource[size];
- int xmlInsertPos = size - 1;
- int xmiInsertPos = 0;
- Resource res = null;
- for (int i = 0; i < size; i++) {
- res = (Resource) theResources.get(i);
- if (res instanceof TranslatorResource)
- sorted[xmlInsertPos--] = res;
- else
- sorted[xmiInsertPos++] = res;
- }
-
- return Arrays.asList(sorted);
- }
-
- /**
- * Process Resources that we are interrested in.
- */
- protected boolean processResourcesIfInterrested(List someResources) {
- int size = someResources.size();
- Resource res;
- boolean processed = false;
- for (int i = 0; i < size; i++) {
- res = (Resource) someResources.get(i);
- if ((res != null) && (isInterrestedInResource(res))) {
- processResource(res);
- processed = true;
- }
- }
- return processed;
- }
-
- public EMFWorkbenchContext getEmfContext() {
- if (isDisposed())
- throw new IllegalStateException("Edit Model already disposed"); //$NON-NLS-1$
- if (emfContext == null)
- throw new IllegalStateException("EMF context is null"); //$NON-NLS-1$
- return emfContext;
- }
-
- public boolean isDisposed() {
- return disposed;
- }
-
-
-
- public IProject getProject() {
- return project;
- }
-
- /**
- * This method should only be called by the EMFWorkbenchContext.
- */
- public void access(Object accessorKey) {
- registry.access(accessorKey);
- }
-
- /**
- * Access
- *
- * @aResource for read or write.
- */
- protected void access(ReferencedResource aResource) {
- if (shouldAccessForRead(aResource))
- aResource.accessForRead();
- else
- aResource.accessForWrite();
- }
-
- /**
- * This method should be called from each client when they are finished working with the
- * EditModel.
- */
- public void releaseAccess(Object accessorKey) {
-
- registry.release(accessorKey);
-
- if (!isDisposing()) {
- boolean shouldDispose = false;
- shouldDispose = registry.size() == 0;
- if (shouldDispose) {
- dispose();
- }
- }
- }
-
- /**
- * Release each of the referenced resources.
- */
- protected void release(Resource aResource) {
-
- removeResource(aResource);
- if (aResource != null && aResource instanceof ReferencedResource)
- release((ReferencedResource) aResource);
- }
-
- /**
- * Release each of the referenced resources.
- */
- protected void release(ReferencedResource aResource) {
- if (isReadOnly())
- aResource.releaseFromRead();
- else
- aResource.releaseFromWrite();
-
- }
-
- /**
- * Release each of the referenced resources.
- */
- protected void releaseResources() {
- List tResources = getSortedResources();
- Resource resource;
- for (int i = 0; i < tResources.size(); i++) {
- resource = (Resource) tResources.get(i);
- release(resource);
- }
- }
-
- public void deleteResource(Resource aResource) {
- if (aResource == null || resources == null || !getResources().contains(aResource))
- return;
- getResourcesTargetedForTermination().add(aResource);
-
- }
-
- /**
- * @return
- */
- protected List getResourcesTargetedForTermination() {
- if (resourcesTargetedForTermination == null)
- resourcesTargetedForTermination = new ArrayList(5);
- return resourcesTargetedForTermination;
- }
-
-
-
- /**
- * Remove my reference to aResource, remove it from the ResourceSet, and delete its file from
- * the Workbench. This only happens if there is currently a reference to
- *
- * @aResource.
- */
- public void primDeleteResource(Resource aResource) {
- if (primFlushResource(aResource)) {
- try {
- getEmfContext().deleteResource(aResource);
- } catch (CoreException e) {
- // what should we do here?
- }
- if (hasListeners()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.REMOVED_RESOURCE, this);
- event.addResource(aResource);
- notifyListeners(event);
- }
- }
- }
-
- /**
- * Remove my reference to aResource and remove it from the ResourceSet.
- */
- public void flushResource(Resource aResource) {
- if (primFlushResource(aResource)) {
- if (hasListeners()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.REMOVED_RESOURCE, this);
- event.addResource(aResource);
- notifyListeners(event);
- }
- }
- }
-
- public Set getAffectedFiles() {
- Set aSet = new HashSet();
- List mofResources = getResources();
- for (int i = 0; i < mofResources.size(); i++) {
- Resource aResource = (Resource) mofResources.get(i);
- IFile output = WorkbenchResourceHelper.getFile(aResource);
- if (output != null)
- aSet.add(output);
- }
- return aSet;
- }
-
- protected List resetKnownResourceUris() {
-
- initializeKnownResourceUris();
-
- return knownResourceUris;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:14:26 PM)
- *
- * @return java.util.List
- */
- public List getResources() {
- if (resources == null)
- resources = new ArrayList(5);
- return resources;
- }
-
- public String[] getResourceURIs() {
- return getResourceURIs(false);
- }
-
- public String[] getResourceURIs(boolean onlyDirty) {
- List list = getResources();
- int dirtyCount = 0;
- String[] uris = new String[list.size()];
- Resource res;
- for (int i = 0; i < list.size(); i++) {
- res = (Resource) list.get(i);
- if (!onlyDirty)
- uris[i] = res.getURI().toString();
- else if (res.isModified()) {
- uris[i] = res.getURI().toString();
- dirtyCount++;
- }
- }
- if (onlyDirty && dirtyCount > 0) {
- String[] dirty = new String[dirtyCount];
- int j = 0;
- for (int i = 0; i < uris.length; i++) {
- if (uris[i] != null) {
- dirty[j] = uris[i];
- j++;
- }
- }
- uris = dirty;
- }
- return uris;
- }
-
- /**
- * Returns the first element in the extent of the resource; logs an error and returns null if
- * the extent is empty
- */
- public static EObject getRoot(Resource aResource) {
- EList extent = aResource.getContents();
- if (extent.size() < 1)
- return null;
- return (EObject) extent.get(0);
- }
-
- /**
- * Handle the failure of
- *
- * @aResource.
- */
- protected void handleSaveFailed(Resource aResource, Exception e) {
- aResource.setModified(true);
- if (isFailedWriteFileFailure(e) && shouldSaveReadOnly(aResource))
- saveResource(aResource);
- else
- primHandleSaveFailed(aResource, e);
- }
-
- /**
- * Return whether any of my resources has been modified.
- */
- protected boolean isAnyResourceDirty() {
- List list = getResources();
- for (int i = 0; i < list.size(); i++) {
- if (((Resource) list.get(i)).isModified())
- return true;
- }
- return false;
- }
-
- /**
- * Return whether a save is needed on the CommandStack
- */
- public boolean isDirty() {
- return isAnyResourceDirty();
- }
-
- protected boolean isFailedWriteFileFailure(Exception ex) {
- return SaveHandlerHeadless.isFailedWriteFileFailure(ex);
- }
-
- /**
- * Return true if you can only read the resources and not write.
- */
- public boolean isReadOnly() {
- return readOnly;
- }
-
- protected boolean isReadOnlyFailure(Exception ex) {
- return false;
- }
-
- public boolean hasReadOnlyResource() {
- try {
- List list = getResources();
- int size = list.size();
- Resource res = null;
- IFile file;
- for (int i = 0; i < size; i++) {
- res = (Resource) list.get(i);
- file = WorkbenchResourceHelper.getFile(res);
- if (file != null && file.isReadOnly())
- return true;
- }
- } catch (NullPointerException e) {
- System.out.println(e);
- }
- return false;
- }
-
- /**
- * @deprecated use createResource(URI) instead
- */
- public Resource makeResource(String aUri) {
- return createResource(URI.createURI(aUri));
- }
-
- /**
- * Return whether any of my resources has a reference count of one and it has been modified.
- */
- public boolean needsToSave() {
- return !isShared() && isDirty();
- }
-
- /**
- * Remove my reference to aResource and remove it from the ResourceSet. Return true if aResource
- * was removed.
- */
- protected boolean primFlushResource(Resource aResource) {
- if (aResource != null && hasResourceReference(aResource)) {
- removeResource(aResource);
- removeResourceSetResource(aResource);
- return true;
- }
- return false;
- }
-
- /**
- * Handle the failure of
- *
- * @aResource.
- */
- protected void primHandleSaveFailed(Resource aResource, Exception e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- Exception nested = null;
- if (e instanceof IWFTWrappedException)
- nested = ((IWFTWrappedException) e).getNestedException();
- else
- nested = e;
-
- throw new SaveFailedException(EMFWorkbenchResourceHandler.getString("An_error_occurred_while_sa_ERROR_"), nested); //$NON-NLS-1$ = "An error occurred while saving."
- }
-
- /**
- * Prompt for a save.
- */
- protected boolean promptToSave(IOperationHandler operationHandler) {
- if (operationHandler == null)
- return false;
- return operationHandler.canContinue(EMFWorkbenchResourceHandler.getString("The_following_resources_ne_UI_"), getResourceURIs(true)); //$NON-NLS-1$ = "The following resources need to be saved but are currently shared, do you want to save now?"
- }
-
- /**
- * This will force all of the referenced Resources to be saved.
- */
- public void primSave(IProgressMonitor monitor) {
- if (isReadOnly())
- return; // do nothing
- deleteResourcesIfNecessary();
- Resource resource;
- if (getResources().isEmpty())
- return; // nothing to save
- List localResources = getSortedResources();
- for (int i = 0; i < localResources.size(); i++) {
- resource = (Resource) localResources.get(i);
- saveResource(resource);
- }
- getCommandStack().saveIsDone();
- if (hasListeners()) {
- EditModelEvent event = new EditModelEvent(EditModelEvent.SAVE, this);
- notifyListeners(event);
- }
- }
-
- /**
- *
- */
- protected void deleteResourcesIfNecessary() {
- if (resourcesTargetedForTermination == null || resourcesTargetedForTermination.size() == 0)
- return;
- Resource deadres = null;
- for (int i = 0; i < getResourcesTargetedForTermination().size(); i++) {
- deadres = (Resource) getResourcesTargetedForTermination().get(i);
- primDeleteResource(deadres);
-
- getResources().remove(deadres);
- getResourcesTargetedForTermination().remove(deadres);
- }
- }
-
-
-
- /**
- * Save
- *
- * @aResource.
- */
- protected void primSaveResource(Resource aResource) throws Exception {
- if (aResource.isModified())
- aResource.save(Collections.EMPTY_MAP);
- }
-
- /**
- * Process resources that have already been loaded.
- */
- protected void processLoadedResources() {
- List loaded = getResourceSet().getResources();
- if (!loaded.isEmpty())
- processResourcesIfInterrested(loaded);
- }
-
- private void processPreloadResources() {
- for (int i = 0; i < preloadResourceUris.size(); i++) {
- URI uri = (URI) preloadResourceUris.get(i);
- getResource(uri);
- }
- }
-
- /**
- * Remove aResource from my ResourceSet. Return true if aResource was removed.
- */
- protected boolean removeResourceSetResource(Resource aResource) {
- aResource.eSetDeliver(false);
- aResource.unload();
- aResource.eSetDeliver(true);
- return getResourceSet().getResources().remove(aResource);
- }
-
- protected void saveResource(Resource resource) {
- try {
- primSaveResource(resource);
- } catch (Exception e) {
- handleSaveFailed(resource, e);
- }
- }
-
- /**
- * Should the resources be saved.
- */
- protected boolean shouldSave() {
- return !isReadOnly() && !isShared();
- }
-
- /**
- * Should the resources be saved.
- */
- protected boolean shouldSave(IOperationHandler operationHandler) {
- return shouldSave() || promptToSave(operationHandler);
- }
-
- protected boolean shouldSaveReadOnly(Resource aResource) {
- IFile aFile = WorkbenchResourceHelper.getFile(aResource);
- if (aFile == null || !aFile.isReadOnly())
- return false;
-
- return getSaveHandler().shouldContinueAndMakeFileEditable(aFile);
- }
-
- /**
- * Force all of the known resource URIs to be loaded if they are not already.
- */
- public void forceLoadKnownResources() {
- List uris = getKnownResourceUris();
- URI uri = null;
- for (int i = 0; i < uris.size(); i++) {
- uri = (URI) uris.get(i);
- getResource(uri);
- }
- }
-
- /**
- * This method should be called when you want to extend this edit model to handle a resource
- * with a URI equal to <code>aRelativeURI</code>.
- */
- public void manageExtensionResourceURI(String aRelativeURI) {
- if (aRelativeURI != null && aRelativeURI.length() > 0) {
- URI uri = URI.createURI(aRelativeURI);
- if (!isInterrestedInResourceUri(uri)) {
- getKnownResourceUris().add(uri);
- // Process the resource if it is already loaded.
- try {
- Resource res = getEmfContext().getResource(uri);
- if (res != null)
- processResource(res);
- } catch (Exception e) {
- // Ignore
- }
- }
- }
- }
-
- /**
- * Get a cached Resource or try to load the Resource prior to creating a Resource. This api
- * handles the case that the Resource may be created during the load.
- */
- public Resource getOrCreateResource(URI uri) {
- return getResource(uri);
- }
-
- /**
- * @return boolean
- */
- public boolean isAccessAsReadForUnKnownURIs() {
- return accessAsReadForUnKnownURIs;
- }
-
- /**
- * Use this api to indicate that you want all unknown Resources to be accessed for ReadOnly.
- *
- * @param b
- */
- public void setAccessAsReadForUnKnownURIs(boolean b) {
- accessAsReadForUnKnownURIs = b;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer(getClass().getName());
- buffer.append(": "); //$NON-NLS-1$
- if (isReadOnly())
- buffer.append(" R = "); //$NON-NLS-1$
- else
- buffer.append(" W = "); //$NON-NLS-1$
- buffer.append(getRegistry().size());
- buffer.append("[ID: \""); //$NON-NLS-1$
- buffer.append(getEditModelID());
- buffer.append("\" Known Resources: ["); //$NON-NLS-1$
- List uris = getKnownResourceUris();
- if (uris != null) {
- int i = 0;
- for (i = 0; i < (uris.size() - 1); i++)
- buffer.append(uris.get(i) + ", "); //$NON-NLS-1$
- buffer.append(uris.get(i));
- buffer.append("]"); //$NON-NLS-1$
- } else
- buffer.append("none"); //$NON-NLS-1$
-
-
- buffer.append("]"); //$NON-NLS-1$
- return buffer.toString();
- }
-
- public Reference getReference() {
- if (reference == null)
- reference = new Reference();
- return reference;
- }
-
- /**
- * @return
- */
- protected ClientAccessRegistry getRegistry() {
- return registry;
- }
-
- public class Reference {
-
- protected String tostring = null;
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (tostring == null) {
- StringBuffer result = new StringBuffer("EditModel.Reference ["); //$NON-NLS-1$
- result.append("{"); //$NON-NLS-1$
- result.append(getEditModelID());
- result.append("} {"); //$NON-NLS-1$
- result.append(getProject().getName());
- result.append("}]"); //$NON-NLS-1$
- tostring = result.toString();
- }
- return tostring;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return toString().hashCode();
- }
- }
-
- /**
- * Subclasses can override - by default this will return the first root object from the first
- * resource referenced by the known resource URIs for this EditModel
- *
- * @return an EObject or Null
- */
- public EObject getPrimaryRootObject() {
- Resource res = getPrimaryResource();
- if (res == null || res.getContents().isEmpty())
- return null;
- return (EObject) res.getContents().get(0);
- }
-
- /**
- * Subclasses can override - by default this will return the first resource referenced by the
- * known resource URIs for this EditModel
- *
- * @return
- */
- public Resource getPrimaryResource() {
- if (knownResourceUris == null)
- getKnownResourceUris();
- if (knownResourceUris == null || knownResourceUris.isEmpty())
- return null;
-
- URI uri = (URI) knownResourceUris.get(0);
- return getResource(uri);
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
- */
- public void identifierChanged(EnablementIdentifierEvent evt) {
- if (evt.hasEnabledChanged()) {
- EditModelEvent editModelEvent = new EditModelEvent(EditModelEvent.KNOWN_RESOURCES_ABOUT_TO_CHANGE, this);
- notifyListeners(editModelEvent);
- IEnablementIdentifier id = evt.getIdentifier();
- if (id.isEnabled())
- addKnownResources(id);
- else
- removeKnownResources(id);
- editModelEvent = new EditModelEvent(EditModelEvent.KNOWN_RESOURCES_CHANGED, this);
- notifyListeners(editModelEvent);
- }
- }
-
- private void removeKnownResources(IEnablementIdentifier id) {
- List editModelResources = getEditModelResources(id);
- EditModelResource editModelResource = null;
- ResourceSetWorkbenchEditSynchronizer sync = (ResourceSetWorkbenchEditSynchronizer) getResourceSetSynchronizer();
- for (int i = 0; i < editModelResources.size(); i++) {
- editModelResource = (EditModelResource) editModelResources.get(i);
- if (editModelResource.isAutoLoad() && sync != null) {
- sync.disableAutoload(editModelResource.getURI());
- preloadResourceUris.remove(editModelResource.getURI());
- }
- knownResourceUris.remove(editModelResource.getURI());
- removeResource(editModelResource.getURI());
- }
-
- }
-
-
-
- private void addKnownResources(IEnablementIdentifier id) {
- List editModelResources = getEditModelResources(id);
- EditModelResource editModelResource = null;
- ResourceSetWorkbenchEditSynchronizer sync = (ResourceSetWorkbenchEditSynchronizer) getResourceSetSynchronizer();
- for (int i = 0; i < editModelResources.size(); i++) {
- editModelResource = (EditModelResource) editModelResources.get(i);
- if (editModelResource.isAutoLoad() && sync != null) {
- sync.enableAutoload(editModelResource.getURI());
- preloadResourceUris.add(editModelResource.getURI());
- getResource(editModelResource.getURI());
- }
- knownResourceUris.add(editModelResource.getURI());
-
- }
- }
-
-
- /**
- * @return Returns the params.
- */
- public Map getParams() {
- return params;
- }
-
- /**
- * @param params
- * The params to set.
- */
- public void setParams(Map params) {
- this.params = params;
- }
-
- public class NotifyRunner implements ISafeRunnable {
-
- private final EditModelEvent event;
- private EditModelListener listener;
-
- public NotifyRunner(EditModelEvent event) {
- Assert.isNotNull(event);
- this.event = event;
- }
-
-
- public void setListener(EditModelListener listener) {
- this.listener = listener;
- }
-
- public void handleException(Throwable exception) {
- EMFWorkbenchEditPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EMFWorkbenchEditPlugin.ID, 0, exception.getMessage(), exception));
-
- }
-
- public void run() throws Exception {
- if(listener != null)
- listener.editModelChanged(event);
- }
-
- };
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelCommand.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelCommand.java
deleted file mode 100644
index 00eed90..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.emf.common.command.Command;
-
-
-
-/**
- * Insert the type's description here. Creation date: (05/22/01 8:57:00 AM)
- *
- * @author: Administrator
- */
-public abstract class EditModelCommand extends AbstractEditModelCommand {
- protected EditModelCommand() {
- super();
- }
-
- public EditModelCommand(Command targetCommand) {
- super(targetCommand);
- }
-
- public boolean canUndo() {
- return getTarget().canUndo();
- }
-
- protected abstract void executeInModel(AbstractEditModelCommand cmd);
-
- public EditModelCommand getEditModelCommand() {
- return this;
- }
-
- public String getLabel() {
- return getTarget().getLabel();
- }
-
- public void invertAndPush() {
- executeInModel(this.inverted());
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
deleted file mode 100644
index 460a84a..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelEvent.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-public class EditModelEvent {
- //These are the event codes.
-
- // Used when the edit model is saved.
- public static final int SAVE = 1;
- // Used when the command stack becomes dirty.
- public static final int DIRTY = 2;
- // Used when a referenced resource is removed from the ResourceSet.
- public static final int REMOVED_RESOURCE = 3;
- // Used when a referenced resource is added to the ResourceSet.
- public static final int ADDED_RESOURCE = 4;
- // Used when the edit model is disposed
- public static final int PRE_DISPOSE = 5;
- // Used when a Resource is loaded or the first object
- // is added to the contents when created.
- public static final int LOADED_RESOURCE = 6;
- // Used when a Resource is unloaded.
- public static final int UNLOADED_RESOURCE = 7;
- // Indicates that the list of known resources managed by the edit model is about to change
- public static final int KNOWN_RESOURCES_ABOUT_TO_CHANGE = 8;
- // Indicates that the list of known resources managed by the edit model has changed
- public static final int KNOWN_RESOURCES_CHANGED = 9;
-
- private int eventCode;
- private EditModel editModel;
- private List changedResources;
-
- /**
- * Insert the method's description here. Creation date: (4/12/2001 2:46:59 PM)
- */
- public EditModelEvent(int anEventCode, EditModel model) {
- setEventCode(anEventCode);
- setEditModel(model);
- }
-
- public void addResource(Resource aResource) {
- if (aResource != null)
- getChangedResources().add(aResource);
- }
-
- public void addResources(Collection someResources) {
- if (someResources != null)
- getChangedResources().addAll(someResources);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/12/2001 2:46:43 PM)
- *
- * @return java.util.List
- */
- public java.util.List getChangedResources() {
- if (changedResources == null)
- changedResources = new ArrayList();
- return changedResources;
- }
-
- /**
- * Insert the method's description here. Creation date: (05/21/01 9:01:08 PM)
- *
- * @return com.ibm.etools.j2ee.workbench.EditModel
- */
- public EditModel getEditModel() {
- return editModel;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/12/2001 2:46:43 PM)
- *
- * @return int
- */
- public int getEventCode() {
- return eventCode;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/12/2001 2:46:43 PM)
- *
- * @param newChangedResources
- * java.util.List
- */
- public void setChangedResources(java.util.List newChangedResources) {
- changedResources = newChangedResources;
- }
-
- /**
- * Insert the method's description here. Creation date: (05/21/01 9:01:08 PM)
- *
- * @param newEditModel
- * com.ibm.etools.j2ee.workbench.EditModel
- */
- public void setEditModel(EditModel newEditModel) {
- editModel = newEditModel;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/12/2001 2:46:43 PM)
- *
- * @param newEventCode
- * int
- */
- public void setEventCode(int newEventCode) {
- eventCode = newEventCode;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelFactory.java
deleted file mode 100644
index d97bbe4..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelFactory.java
+++ /dev/null
@@ -1,62 +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.internal.emfworkbench.integration;
-
-
-import java.util.Map;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-
-public class EditModelFactory implements IEditModelFactory {
- protected boolean loadKnownResourcesAsReadOnly = true;
-
- public EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context) {
- return createEditModelForRead(editModelID, context, null);
- }
-
- public EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context) {
- return createEditModelForWrite(editModelID, context, null);
- }
-
- public EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context, Map params) {
- EditModel editModel = new EditModel(editModelID, context, true);
- editModel.setAccessAsReadForUnKnownURIs(loadKnownResourcesAsReadOnly);
- return editModel;
- }
-
- public EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context, Map params) {
- EditModel editModel = new EditModel(editModelID, context, false);
- editModel.setAccessAsReadForUnKnownURIs(loadKnownResourcesAsReadOnly);
- return editModel;
- }
-
- public String getCacheID(String editModelID, Map params) {
- return editModelID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.IEditModelFactory#setLoadKnownResourcesAsReadOnly(boolean)
- */
- public void setLoadKnownResourcesAsReadOnly(boolean value) {
- this.loadKnownResourcesAsReadOnly = value;
- }
-
- /**
- * @return Returns the loadKnownResourcesAsReadOnly.
- */
- protected boolean isLoadKnownResourcesAsReadOnly() {
- return loadKnownResourcesAsReadOnly;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelListener.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelListener.java
deleted file mode 100644
index aefe9e4..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-/**
- * Insert the type's description here. Creation date: (4/11/2001 4:45:13 PM)
- *
- * @author: Administrator
- */
-public interface EditModelListener {
- /**
- * An event ocurred on the J2EEEditModel.
- */
- void editModelChanged(EditModelEvent anEvent);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelNature.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelNature.java
deleted file mode 100644
index f80a886..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModelNature.java
+++ /dev/null
@@ -1,64 +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
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import java.util.Map;
-
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class EditModelNature extends EMFNature {
- /**
- *
- */
- public EditModelNature() {
- super();
- }
-
- public EditModel getEditModelForRead(String editModelKey, Object accessorKey) {
- return getEditModelForRead(editModelKey, accessorKey, null);
- }
-
- public EditModel getEditModelForWrite(String editModelKey, Object accessorKey) {
- return getEditModelForWrite(editModelKey, accessorKey, null);
- }
-
- public EditModel getEditModelForRead(String editModelKey, Object accessorKey, Map params) {
- EditModel result = null;
- if (getEmfContext() != null)
- result = getEmfContext().getEditModelForRead(editModelKey, accessorKey, params);
- return result;
- }
-
- public EditModel getEditModelForWrite(String editModelKey, Object accessorKey, Map params) {
- EditModel result = null;
- if (getEmfContext() != null)
- result = getEmfContext().getEditModelForWrite(editModelKey, accessorKey, params);
- return result;
- }
-
- protected EMFWorkbenchContext getEmfContext() {
- return (EMFWorkbenchContext) getEmfContextBase();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/IEditModelFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/IEditModelFactory.java
deleted file mode 100644
index 873209f..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/IEditModelFactory.java
+++ /dev/null
@@ -1,31 +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.internal.emfworkbench.integration;
-
-import java.util.Map;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-
-public interface IEditModelFactory {
-
- public abstract EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context);
-
- public abstract EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context, Map params);
-
- public abstract EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context);
-
- public abstract EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context, Map params);
-
- public String getCacheID(String editModelID, Map params);
-
- public void setLoadKnownResourcesAsReadOnly(boolean value);
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/LooseComposedEditModel.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/LooseComposedEditModel.java
deleted file mode 100644
index f9a5f82..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/LooseComposedEditModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-
-/**
- * @author Administrator
- */
-public class LooseComposedEditModel extends ComposedEditModel {
-
- public LooseComposedEditModel(String editModelID, EMFWorkbenchContext context) {
- super(editModelID, context);
-
- }
-
- public EditModel.Reference addChild(EditModel editModel) {
- getChildren().add(editModel);
- Reference ref = editModel.getReference();
- getChildrenMap().put(ref, editModel);
- return ref;
- }
-
- public void removeChild(EditModel editModel) {
- getChildren().remove(editModel);
- getChildrenMap().remove(editModel.getReference());
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModelModifier.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModelModifier.java
deleted file mode 100644
index c0ed86a..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModelModifier.java
+++ /dev/null
@@ -1,621 +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.internal.emfworkbench.integration;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-/**
- * Insert the type's description here. Creation date: (4/6/2001 3:40:35 PM)
- *
- * @author: Administrator
- */
-public class ModelModifier {
- private static final String SET_PATTERN = "Set {0}"; //$NON-NLS-1$
- private static final String ADD_PATTERN = "Add {0}"; //$NON-NLS-1$
- private static final String REMOVE_PATTERN = "Remove {0}"; //$NON-NLS-1$
- private static final String DEFAULT_COMMAND_LABEL = "Command"; //$NON-NLS-1$
- private EditingDomain editingDomain;
- private List helpers;
- private List extendedHelpers;
- protected List additionalCommands;
- protected int status;
- public static final int NO_VALUE_CHANGE = 0;
- public static final int VALUE_CHANGE = 1;
- public static final int ERROR = 2;
-
- /**
- * J2EEModelModifier constructor comment.
- */
- public ModelModifier() {
- super();
- }
-
- /**
- * J2EEModelModifier constructor comment.
- *
- * @param aDomain
- * EditingDomain
- */
- public ModelModifier(EditingDomain aDomain) {
- setEditingDomain(aDomain);
- }
-
- /**
- * Add
- *
- * @aHelper to the list of helper that will be executed.
- */
- public void addHelper(ModifierHelper aHelper) {
- if (aHelper != null && !getHelpers().contains(aHelper))
- getHelpers().add(aHelper);
- }
-
- public void addAdditionalCommand(Command aCommand) {
- if (aCommand != null && !getAdditionalCommands().contains(aCommand))
- additionalCommands.add(aCommand);
- }
-
- /**
- * Return true if this modifier can create a command that will perform the necessary operation.
- */
- public boolean canExecuteCommand() {
- return getEditingDomain() != null;
- }
-
- public int executeWithStatus() {
- try {
- execute();
- return status;
- } finally {
- status = -1;
- }
- }
-
- /**
- * Execute this modifier using the recording mechanism of the StructedTextUndoManager. If this
- * modifier cannot record, try to execute using the CommandStack (if it can execute commands).
- * Return true if the execution was attempted.
- *
- * @see canExecuteCommand()
- * @see canRecord()
- * @see run()
- */
- public boolean execute(ModifierHelper aHelper) {
- addHelper(aHelper);
- return execute();
- }
-
- /**
- * Execute this modifier using the recording mechanism of the StructedTextUndoManager. If this
- * modifier cannot record, try to execute using the CommandStack (if it can execute commands).
- * Return true if the execution was attempted.
- *
- * @see canExecuteCommand()
- * @see canRecord()
- * @see run()
- */
- public boolean execute(List someHelpers) {
- setHelpers(someHelpers);
- return execute();
- }
-
- /**
- * Execute this modifier by creating a Command that is executed on the CommandStack. If this
- * modifier cannot execute commands, the execution will not take place. Return true if the
- * execution was attempted.
- *
- * @see canExecuteCommand()
- */
- public boolean execute() {
- boolean result = false;
- if (canExecuteCommand()) {
- try {
- Command command = createCommand();
- result = command != null;
- if (result) {
- getCommandStack().execute(command);
- }
- } finally {
- release();
- }
- } else {
- setStatus(ERROR);
- }
- return result;
- }
-
- protected CommandStack getCommandStack() {
- if (getEditingDomain() != null)
- return getEditingDomain().getCommandStack();
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 2:53:17 PM)
- *
- * @return EditingDomain
- */
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/10/2001 8:46:35 AM)
- *
- * @return J2EEModifierHelper
- */
- public ModifierHelper getFirstHelper() {
- if (helpers != null && getHelpers().size() > 0)
- return (ModifierHelper) getHelpers().get(0);
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/10/2001 8:46:35 AM)
- *
- * @return java.util.List
- */
- public java.util.List getHelpers() {
- if (helpers == null)
- helpers = new ArrayList();
- return helpers;
- }
-
- public java.util.List getAdditionalCommands() {
- if (additionalCommands == null)
- additionalCommands = new ArrayList();
- return additionalCommands;
- }
-
- /**
- * Release all model artifacts.
- */
- protected void release() {
- setEditingDomain(null);
- setHelpers(null);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 2:53:17 PM)
- *
- * @param newEditingDomain
- * EditingDomain
- */
- public void setEditingDomain(EditingDomain newEditingDomain) {
- editingDomain = newEditingDomain;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/10/2001 8:46:35 AM)
- *
- * @param newHelpers
- * java.util.List
- */
- public void setHelpers(java.util.List newHelpers) {
- helpers = newHelpers;
- }
-
- protected void setStatus(int statusCode) {
- if (statusCode > status)
- status = statusCode;
- }
-
- /**
- * Return an AddCommand that will be executed by a CommandStack.
- */
- protected Command createAddCommand(ModifierHelper aHelper) {
- Object value = getValue(aHelper);
- Command command = null;
- if (valueChanged(aHelper.getOwner(), aHelper.getFeature(), value, false)) {
- command = AddCommand.create(getEditingDomain(), aHelper.getOwner(), aHelper.getFeature(), value);
- ((AbstractCommand) command).setLabel(createCommandLabel(ADD_PATTERN, aHelper.getFeature()));
- setStatus(VALUE_CHANGE);
- } else {
- setStatus(NO_VALUE_CHANGE);
- }
- return command;
- }
-
- /**
- * Return a Command that will be executed by a CommandStack. The default is to return null.
- * Subclasses should override this method.
- */
- public Command createCommand() {
- Command chainedCommand = createCommand(null, getHelpers());
- if (null == chainedCommand && additionalCommands != null && additionalCommands.isEmpty()) {
- setStatus(ERROR);
- return null;
- }
- chainedCommand = appendAdditionalCommands(chainedCommand);
- return chainedCommand;
- }
-
- protected Command createCommand(Command chainedCommand, List helpersArg) {
- if (null == extendedHelpers) {
- extendedHelpers = new ArrayList();
- }
-
- if (!helpersArg.isEmpty()) {
- Iterator it = helpersArg.iterator();
- Command nextCommand = null;
- while (it.hasNext()) {
- nextCommand = createCommand((ModifierHelper) it.next());
- if (chainedCommand == null)
- chainedCommand = nextCommand;
- else if (nextCommand != null)
- chainedCommand = chainedCommand.chain(nextCommand);
- }
- }
- if (!extendedHelpers.isEmpty()) {
- List copy = new ArrayList();
- copy.addAll(extendedHelpers);
- extendedHelpers.clear();
- chainedCommand = createCommand(chainedCommand, copy);
- }
- return chainedCommand;
- }
-
- protected Command appendAdditionalCommands(Command chainedCommand) {
- if (additionalCommands != null && !additionalCommands.isEmpty()) {
- Command command;
- for (int i = 0; i < additionalCommands.size(); i++) {
- command = (Command) additionalCommands.get(i);
- if (chainedCommand == null)
- chainedCommand = command;
- else
- chainedCommand = chainedCommand.chain(command);
- }
- }
- return chainedCommand;
- }
-
- /**
- * Return a Command that will be executed by a CommandStack.
- */
- protected Command createCommand(ModifierHelper aHelper) {
- if (aHelper == null)
- return null;
- Command command1, command2;
- ModifierHelper ownerHelper = aHelper.getOwnerHelper();
- if (aHelper.shouldUnsetValue() && ownerHelper != null)
- return null; //we are unsetting a value on an owner that does not exist so do not
- // create the owner
- command1 = createCommand(ownerHelper);
- command2 = primCreateCommand(aHelper);
-
- if (command1 != null) {
- if (command2 == null)
- command2 = command1;
- else
- command2 = command2.chain(command1);
- }
- return command2;
- }
-
- protected String createCommandLabel(String aPattern, EStructuralFeature feature) {
- String replacement = feature == null ? DEFAULT_COMMAND_LABEL : feature.getName();
- return java.text.MessageFormat.format(aPattern, new String[]{replacement});
- }
-
- /**
- * Return a Command that will be executed by a CommandStack. The default is to return null.
- * Subclasses should override this method.
- */
- protected Command createManyCommand(ModifierHelper aHelper) {
- if (aHelper.shouldUnsetValue())
- return createRemoveCommand(aHelper);
- return createAddCommand(aHelper);
- }
-
- protected EObject createObjectFromHelper(ModifierHelper aHelper) {
- return aHelper.createNewObjectFromFeature();
- }
-
-
- /**
- * Used to remove an object on unset. Makes the object a proxy
- * on execute and redo commands. Undo will remove the proxy.
- */
- public class ProxyWrappingCommand extends AbstractCommand {
- protected Command baseCommand = null;
- protected EObject eObject = null;
- protected Resource resource = null;
-
- public ProxyWrappingCommand(Command baseCommand, EObject eObject) {
- this.baseCommand = baseCommand;
- this.eObject = eObject;
- this.resource = eObject.eResource();
- }
-
- public boolean canExecute() {
- return baseCommand.canExecute();
- }
-
- public void execute() {
- ExtendedEcoreUtil.becomeProxy(eObject, resource);
- baseCommand.execute();
- }
-
- public boolean canUndo() {
- return baseCommand.canUndo();
- }
-
- public void undo() {
- baseCommand.undo();
- ExtendedEcoreUtil.removeProxy(eObject, resource);
- }
-
- public void redo() {
- ExtendedEcoreUtil.becomeProxy(eObject, resource);
- baseCommand.redo();
- }
-
- public Collection getResult() {
- return baseCommand.getResult();
- }
-
- public Collection getAffectedObjects() {
- return baseCommand.getAffectedObjects();
- }
-
- public String getLabel() {
- return baseCommand.getLabel();
- }
-
- public String getDescription() {
- return baseCommand.getDescription();
- }
-
- public void dispose() {
- super.dispose();
- baseCommand.dispose();
- }
- }
-
- /**
- * Return a Remove Command that will be executed by a CommandStack.
- */
- protected Command createRemoveCommand(ModifierHelper aHelper) {
- Object value = getValue(aHelper);
- Command command = null;
- EStructuralFeature feature = aHelper.getFeature();
- if (valueChanged(aHelper.getOwner(), feature, value, true)) {
- if (isValueEqual(aHelper, value)) {
- command = RemoveCommand.create(getEditingDomain(), aHelper.getOwner(), feature, (Collection) value);
- } else {
- command = RemoveCommand.create(getEditingDomain(), aHelper.getOwner(), feature, value);
- }
- ((AbstractCommand) command).setLabel(createCommandLabel(REMOVE_PATTERN, feature));
- setStatus(VALUE_CHANGE);
- } else {
- setStatus(NO_VALUE_CHANGE);
- }
- return command;
- }
-
- private boolean isValueEqual(ModifierHelper aHelper, Object value) {
- return aHelper.getOwner().eGet(aHelper.getFeature()) == value;
- }
-
- /**
- * Return a SetCommand that will be executed by a CommandStack.
- */
- protected Command createSingleCommand(ModifierHelper aHelper) {
- Object value = getValue(aHelper);
- Command command = null;
- if (valueChanged(aHelper.getOwner(), aHelper.getFeature(), value, aHelper.shouldUnsetValue())) {
- command = SetCommand.create(getEditingDomain(), aHelper.getOwner(), aHelper.getFeature(), value);
- ((AbstractCommand) command).setLabel(createCommandLabel(SET_PATTERN, aHelper.getFeature()));
- setStatus(VALUE_CHANGE);
- } else {
- setStatus(NO_VALUE_CHANGE);
- }
- return command;
- }
-
- protected Object createValueFromHelper(ModifierHelper aHelper) {
- EObject newObject = createObjectFromHelper(aHelper);
- setNewObjectAttributes(newObject, aHelper);
- return newObject;
- }
-
- protected boolean enumValueChanged(EObject anObject, EStructuralFeature aFeature, Object aValue) {
- if (!anObject.eIsSet(aFeature))
- return true;
- Enumerator existingEnumerator = (Enumerator) anObject.eGet(aFeature);
- Enumerator newEnumerator = getEnumerator(aFeature, aValue);
- return existingEnumerator != newEnumerator;
- }
-
- private Enumerator getEnumerator(EStructuralFeature aFeature, Object aValue) {
- if (aValue instanceof Enumerator)
- return (Enumerator) aValue;
- EEnum anEnum = (EEnum) aFeature.getEType();
- EEnumLiteral literal = null;
- if (aValue instanceof String)
- literal = anEnum.getEEnumLiteral((String) aValue);
- else if (aValue instanceof Integer)
- literal = anEnum.getEEnumLiteral(((Integer) aValue).intValue());
- if (literal != null)
- return literal.getInstance();
- return null;
- }
-
- protected Object getValue(ModifierHelper aHelper) {
- if (aHelper.mustCreateValue()) {
- Object value = createValueFromHelper(aHelper);
- aHelper.setValue(value);
- }
- return aHelper.getValue();
- }
-
- protected boolean manyValueChanged(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean isUnset) {
- List list = (List) anObject.eGet(aFeature);
- if (isUnset)
- return list.contains(aValue) || (list == aValue && !list.isEmpty());
- return !list.contains(aValue);
- }
-
- /**
- * Return a Command that will be executed by a CommandStack. The default is to return null.
- * Subclasses should override this method.
- */
- protected Command primCreateCommand(ModifierHelper aHelper) {
- Command command = doCreateCommand(aHelper);
- if (aHelper.shouldUnsetValue()) {
- Object value = aHelper.getValue();
- if (value instanceof EObject && !((EObject) value).eIsProxy()) {
- command = new ProxyWrappingCommand(command, (EObject) value);
- }
- }
- return command;
- }
-
- protected Command doCreateCommand(ModifierHelper aHelper) {
- if (!aHelper.isComplete()) {
- setStatus(ERROR);
- return null;
- }
- Command command = null;
- if (aHelper.getFeature().isMany())
- command = createManyCommand(aHelper);
- else
- command = createSingleCommand(aHelper);
-
- if (null != command) {
- List localHelpers = ModifierHelperRegistry.getInstance().getHelpers(aHelper);
- if (null != localHelpers) {
- extendedHelpers.addAll(localHelpers);
- }
- }
- return command;
-
- }
-
- /**
- * Run using
- *
- * @aHelper. This will set a MOF attibute value to the owner of the helper.
- */
- protected void primRun(ModifierHelper aHelper) {
- if (aHelper.isComplete()) {
- Object value = getValue(aHelper);
- if (valueChanged(aHelper.getOwner(), aHelper.getFeature(), value, aHelper.shouldUnsetValue()))
- setObjectAttribute(aHelper.getOwner(), aHelper.getFeature(), value, aHelper.shouldUnsetValue());
- }
- }
-
- /**
- * The default is to do nothing. Subclasses should override this method if they are using
- * recordable commands. The implementation of this method should update the MOF model directly.
- * Any modification will be recorded.
- */
- public void run() {
- if (!getHelpers().isEmpty()) {
- Iterator it = getHelpers().iterator();
- while (it.hasNext())
- run((ModifierHelper) it.next());
- }
- }
-
- /**
- * Run using
- *
- * @aHelper's ownerHelper first before running with
- * @aHelper.
- */
- protected void run(ModifierHelper aHelper) {
- if (aHelper != null) {
- run(aHelper.getOwnerHelper());
- primRun(aHelper);
- }
- }
-
- protected void setNewObjectAttributes(EObject anObject, ModifierHelper aHelper) {
- HashMap attributes = aHelper.getAttributes();
- Iterator it = attributes.keySet().iterator();
- EStructuralFeature feature;
- Object value = null;
- while (it.hasNext()) {
- feature = (EStructuralFeature) it.next();
- value = attributes.get(feature);
- setObjectAttribute(anObject, feature, value, false);
- }
- }
-
- protected void setObjectAttribute(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean shouldUnsetValue) {
- if (aFeature.isMany())
- setObjectManyAttribute(anObject, aFeature, aValue, shouldUnsetValue);
- else
- setObjectSingleAttribute(anObject, aFeature, aValue, shouldUnsetValue);
- }
-
- protected void setObjectEnumAttribute(EObject anObject, EStructuralFeature aFeature, Object aValue) {
- Enumerator enumerator = getEnumerator(aFeature, aValue);
- anObject.eSet(aFeature, enumerator);
- }
-
- protected void setObjectManyAttribute(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean shouldUnsetValue) {
- List list = (List) anObject.eGet(aFeature);
- if (shouldUnsetValue)
- list.remove(aValue);
- else
- list.add(aValue);
- }
-
- protected void setObjectSingleAttribute(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean shouldUnsetValue) {
- if (shouldUnsetValue)
- anObject.eUnset(aFeature);
- else if (aFeature.getEType() instanceof EEnum)
- setObjectEnumAttribute(anObject, aFeature, aValue);
- else
- anObject.eSet(aFeature, aValue);
- }
-
- protected boolean singleValueChanged(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean isUnset) {
- if (aFeature.getEType() instanceof EEnum)
- return enumValueChanged(anObject, aFeature, aValue);
-
- Object existingValue = anObject.eGet(aFeature);
- if (existingValue == null && aValue == null)
- return false;
- if (existingValue != null && !existingValue.equals(aValue))
- return true;
- if (aValue != null && !aValue.equals(existingValue))
- return true;
- return false;
- }
-
- protected boolean valueChanged(EObject anObject, EStructuralFeature aFeature, Object aValue, boolean isUnset) {
- if (aFeature.isMany())
- return manyValueChanged(anObject, aFeature, aValue, isUnset);
- return singleValueChanged(anObject, aFeature, aValue, isUnset);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelper.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelper.java
deleted file mode 100644
index ad949b3..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelper.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-
-import java.util.HashMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConversionException;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConverter;
-
-/**
- * Insert the type's description here. Creation date: (4/6/2001 3:23:36 PM)
- *
- * @author: Administrator
- */
-public class ModifierHelper {
-
- private EObject owner;
- private ModifierHelper ownerHelper;
- private OwnerProvider ownerProvider;
- private Object value;
- private EStructuralFeature feature;
- private HashMap attributes;
- private boolean shouldUnsetValue = false;
- private String valueXSITypeName;
- private FeatureValueConverter featureValueConverter;
-
- public static final int ACTION_SET = 0;
- public static final int ACTION_UNSET = 1;
- public static final int ACTION_BOTH = 2;
-
- /**
- * J2EEModifierHelper constructor comment.
- */
- public ModifierHelper() {
- super();
- }
-
- /**
- * J2EEModifierHelper constructor comment.
- */
- public ModifierHelper(EObject anOwner, EStructuralFeature aFeature, Object aValue) {
- setOwner(anOwner);
- setFeature(aFeature);
- setValue(aValue);
- }
-
- /**
- * J2EEModifierHelper constructor comment.
- */
- public ModifierHelper(ModifierHelper anOwnerHelper, EStructuralFeature aFeature, Object aValue) {
- setOwnerHelper(anOwnerHelper);
- setFeature(aFeature);
- setValue(aValue);
- }
-
- /**
- * J2EEModifierHelper constructor comment.
- */
- public ModifierHelper(OwnerProvider anOwnerProvider, EStructuralFeature aFeature, Object aValue) {
- setOwnerProvider(anOwnerProvider);
- setFeature(aFeature);
- setValue(aValue);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return java.util.HashMap
- */
- public void addAttribute(EStructuralFeature aFeature, Object aValue) {
- if (aFeature != null && aValue != null)
- getAttributes().put(aFeature, aValue);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newValue
- * java.lang.Object
- */
- protected Object convertValue(java.lang.Object newValue) {
- return getFeatureValueConverter().convertValue(newValue, getFeature());
- }
-
- //Calling this will cause the value to be removed or unset from the owner.
- public void doUnsetValue() {
- shouldUnsetValue = true;
- if (value != SetCommand.UNSET_VALUE && feature != null && !feature.isMany())
- primSetValue(SetCommand.UNSET_VALUE);
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return java.util.HashMap
- */
- public java.util.HashMap getAttributes() {
- if (attributes == null)
- attributes = new HashMap();
- return attributes;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return org.eclipse.emf.ecore.EFactory
- */
- protected org.eclipse.emf.ecore.EFactory getFactory() {
- return getPackage().getEFactoryInstance();
- }
-
- protected EPackage getPackage() {
- return ((EClassImpl) getFeatureType()).getEPackage();
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return org.eclipse.emf.ecore.EStructuralFeature
- */
- public org.eclipse.emf.ecore.EStructuralFeature getFeature() {
- return feature;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return EObject
- */
- protected EObject getFeatureType() {
- return getFeature().getEType();
- }
-
- /**
- * Insert the method's description here. Creation date: (5/10/2001 4:51:58 PM)
- *
- * @return com.ibm.etools.j2ee.commands.FeatureValueConverter
- */
- public FeatureValueConverter getFeatureValueConverter() {
- if (featureValueConverter == null)
- featureValueConverter = FeatureValueConverter.DEFAULT;
- return featureValueConverter;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return String
- */
- protected String getNewValueTypeName() {
- if (getValueXSITypeName() != null && getValueXSITypeName().length() > 0)
- return getValueXSITypeName();
- return (((EClass) getFeatureType()).getName());
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return org.eclipse.emf.ecore.EObject
- */
- public org.eclipse.emf.ecore.EObject getOwner() {
- if (owner == null) {
- OwnerProvider provider = getOwnerProvider();
- EObject providerOwner = null;
- if (provider != null)
- providerOwner = provider.getOwner();
- if (providerOwner == null && getOwnerHelper() != null)
- providerOwner = (EObject) getOwnerHelper().getValue();
- return providerOwner;
- }
- return owner;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/8/2001 2:47:54 PM)
- *
- * @return com.ibm.etools.j2ee.commands.J2EEModifierHelper
- */
- public ModifierHelper getOwnerHelper() {
- if (ownerHelper == null) {
- if (getOwnerProvider() != null && getOwnerProvider().getOwner() == null)
- return getOwnerProvider().getOwnerHelper();
- }
- return ownerHelper;
- }
-
- public ModifierHelper primGetOwnerHelper() {
- return ownerHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (9/18/2001 1:31:14 PM)
- *
- * @return com.ibm.etools.j2ee.ui.J2EEOwnerProvider
- */
- public OwnerProvider getOwnerProvider() {
- return ownerProvider;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @return java.lang.Object
- */
- public java.lang.Object getValue() {
- return value;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/10/2001 3:39:31 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getValueXSITypeName() {
- return valueXSITypeName;
- }
-
- /**
- * This will automatically get called from the J2EEModelModifier before executing so it is not
- * necessary to call it directly.
- */
- public boolean isComplete() {
- boolean result = true;
- if (getOwnerHelper() != null)
- result = getOwnerHelper().isComplete();
- if (!mustCreateValue())
- result = getValue() != null || shouldUnsetValue();
- else
- result = getFeatureType() != null;
- return result && getFeature() != null && (getOwner() != null || getOwnerHelper() != null);
- }
-
- public boolean mustCreateValue() {
- return getValue() == null && getFeature() != null && !shouldUnsetValue();
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newValue
- * java.lang.Object
- */
- public void primSetValue(java.lang.Object newValue) {
- value = newValue;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newFeature
- * org.eclipse.emf.ecore.EStructuralFeature
- */
- public void setFeature(org.eclipse.emf.ecore.EStructuralFeature newFeature) {
- feature = newFeature;
- }
-
- /**
- * Insert the method's description here. Creation date: (5/10/2001 4:51:58 PM)
- *
- * @param newFeatureValueConverter
- * com.ibm.etools.j2ee.commands.FeatureValueConverter
- */
- public void setFeatureValueConverter(FeatureValueConverter newFeatureValueConverter) {
- featureValueConverter = newFeatureValueConverter;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newOwner
- * org.eclipse.emf.ecore.EObject
- */
- public void setOwner(org.eclipse.emf.ecore.EObject newOwner) {
- owner = newOwner;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/8/2001 2:47:54 PM)
- *
- * @param newOwnerHelper
- * com.ibm.etools.j2ee.commands.J2EEModifierHelper
- */
- public void setOwnerHelper(ModifierHelper newOwnerHelper) {
- ownerHelper = newOwnerHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (9/18/2001 1:31:14 PM)
- *
- * @param newOwnerProvider
- * com.ibm.etools.j2ee.ui.J2EEOwnerProvider
- */
- public void setOwnerProvider(OwnerProvider newOwnerProvider) {
- ownerProvider = newOwnerProvider;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newValue
- * java.lang.Object
- */
- public void setValue(java.lang.Object newValue) {
- try {
- primSetValue(convertValue(newValue));
- } catch (FeatureValueConversionException featureException) {
- Logger.getLogger().logError(featureException);
- primSetValue(null);
- }
- }
-
- /**
- * Treat an empty String as a null value. Creation date: (4/6/2001 3:28:16 PM)
- *
- * @param newValue
- * java.lang.Object
- */
- public void setValueFromWidget(String newValue) {
- Object data = newValue;
- if (newValue != null && newValue.length() == 0)
- data = null;
- setValue(data);
- if (data == null)
- doUnsetValue();
- else
- shouldUnsetValue = false;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/10/2001 3:39:31 PM)
- *
- * @param newValueXSITypeName
- * java.lang.String
- */
- public void setValueXSITypeName(java.lang.String newValueXSITypeName) {
- valueXSITypeName = newValueXSITypeName;
- }
-
- public boolean shouldUnsetValue() {
- return shouldUnsetValue;
- }
-
- public EObject createNewObjectFromFeature() {
- EClass metaClass = (EClass) getPackage().getEClassifier(getNewValueTypeName());
- return getFactory().create(metaClass);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperChainer.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperChainer.java
deleted file mode 100644
index d36148d..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperChainer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-
-
-/**
- * @version 1.0
- * @author
- */
-public class ModifierHelperChainer {
-
- ModifierHelper helper;
-
- public ModifierHelperChainer(EStructuralFeature feature, EObject owner, Object value) {
- helper = new ModifierHelper();
-
- if (owner != null)
- helper.setOwner(owner);
-
- helper.setFeature(feature);
-
- if (value != null)
- helper.setValue(value);
-
- }
-
- public ModifierHelper getHelper() {
- return helper;
- }
-
- public void setOwnerBasedOnType(Object owner) {
- if (owner instanceof EObject)
- helper.setOwner((EObject) owner);
- else if (owner instanceof ModifierHelper)
- helper.setOwnerHelper((ModifierHelper) owner);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperFactory.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperFactory.java
deleted file mode 100644
index bc41a62..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface ModifierHelperFactory {
-
-
- /**
- * @param baseHelper
- * @param actionFlag
- * @return
- */
- ModifierHelper getHelper(ModifierHelper baseHelper, int actionFlag);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperRegistry.java
deleted file mode 100644
index b1da8ad..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ModifierHelperRegistry.java
+++ /dev/null
@@ -1,273 +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
- *******************************************************************************/
-/*
- * Created on Apr 27, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author jsholl
- *
- */
-public class ModifierHelperRegistry {
- private static final String PLUGIN_ID = "org.eclipse.wst.common.internal.emfworkbench.integration"; //$NON-NLS-1$
- private static final String EXTENSION_POINT = "ModifierHelperFactory"; //$NON-NLS-1$
- private static final String FACTORY_CLASS = "class"; //$NON-NLS-1$
- private static final String PACKAGE = "package"; //$NON-NLS-1$
- private static final String PACKAGE_URI = "uri"; //$NON-NLS-1$
- private static final String NAME = "name"; //$NON-NLS-1$
- private static final String TYPE = "type"; //$NON-NLS-1$
- private static final String FEATURE = "feature"; //$NON-NLS-1$
- private static final String FEATURE_ACTION = "action"; //$NON-NLS-1$
- private static final String FEATURE_ACTION_SET = "set"; //$NON-NLS-1$
- private static final String FEATURE_ACTION_UNSET = "unset"; //$NON-NLS-1$
- private static final String FEATURE_ACTION_BOTH = "both"; //default //$NON-NLS-1$
- private static ModifierHelperRegistry INSTANCE = null;
- // Hashtable mapping features to a list of FactoryHolders
- private Hashtable featureHash = new Hashtable();
- private Hashtable factoryHash = new Hashtable();
-
- private class FactoryHolder {
- private int actionType;
- private IConfigurationElement element;
-
- public FactoryHolder(IConfigurationElement element, int actionType) {
- this.element = element;
- this.actionType = actionType;
- }
-
- public ModifierHelperFactory getFactory(int actionTypeArg) {
- if (this.actionType == actionTypeArg || this.actionType == ModifierHelper.ACTION_BOTH) {
- String hashKey = getFactoryHash(element);
- ModifierHelperFactory factory = (ModifierHelperFactory) factoryHash.get(hashKey);
- if (null == factory) {
- try {
- factory = (ModifierHelperFactory) element.createExecutableExtension(FACTORY_CLASS);
- factoryHash.put(hashKey, factory);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- return factory;
- }
- return null;
- }
-
- public boolean equals(Object obj) {
- if (super.equals(obj)) {
- return true;
- }
- FactoryHolder holder = (FactoryHolder) obj;
- return getFactoryHash(element).equals(getFactoryHash(holder.element));
- }
- }
-
- private ModifierHelperRegistry() {
- readExtensions();
- }
-
- private void readExtensions() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, EXTENSION_POINT);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- readFactory(elements[i]);
- }
- }
-
- private void readFactory(IConfigurationElement element) {
- String factoryClassName = element.getAttribute(FACTORY_CLASS);
- if (null == factoryClassName) {
- logError(element, "No " + FACTORY_CLASS + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- }
- IConfigurationElement[] packages = element.getChildren(PACKAGE);
- if (packages.length == 0) {
- logError(element, "No " + PACKAGE + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- }
- for (int j = 0; j < packages.length; j++) {
- readPackage(element, packages[j]);
- }
- }
-
- private void readPackage(IConfigurationElement factoryElement, IConfigurationElement element) {
- String packageURI = element.getAttribute(PACKAGE_URI);
- if (null == packageURI) {
- logError(element, "No " + PACKAGE_URI + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(packageURI);
- if (null == ePackage) {
- logError(element, PACKAGE + " " + packageURI + " can not be found."); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
- IConfigurationElement[] types = element.getChildren(TYPE);
- if (types.length == 0) {
- logError(element, "No " + TYPE + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- }
- for (int i = 0; i < types.length; i++) {
- readType(factoryElement, ePackage, types[i]);
- }
- }
-
- private void readType(IConfigurationElement factoryElement, EPackage ePackage, IConfigurationElement element) {
- String typeName = element.getAttribute(NAME);
- if (null == typeName) {
- logError(element, "No " + NAME + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
- EClassifier eClassifier = ePackage.getEClassifier(typeName);
- if (null == eClassifier) {
- logError(element, TYPE + " " + typeName + " can not be found in " + PACKAGE + " " + ePackage.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return;
- }
- EClass eClass = (EClass) eClassifier;
- IConfigurationElement[] features = element.getChildren(FEATURE);
- if (features.length == 0) {
- logError(element, "No " + FEATURE + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
- for (int i = 0; i < features.length; i++) {
- readFeature(factoryElement, eClass, features[i]);
- }
- }
-
- private void readFeature(IConfigurationElement factoryElement, EClass eClass, IConfigurationElement element) {
- String featureName = element.getAttribute(NAME);
- if (null == featureName) {
- logError(element, "No " + NAME + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
- String action = element.getAttribute(FEATURE_ACTION);
- if (null == action) {
- action = FEATURE_ACTION_BOTH;
- }
- int actionType = -1;
- if (action.equalsIgnoreCase(FEATURE_ACTION_BOTH)) {
- actionType = ModifierHelper.ACTION_BOTH;
- } else if (action.equalsIgnoreCase(FEATURE_ACTION_SET)) {
- actionType = ModifierHelper.ACTION_SET;
- } else if (action.equalsIgnoreCase(FEATURE_ACTION_UNSET)) {
- actionType = ModifierHelper.ACTION_UNSET;
- }
- if (actionType == -1) {
- logError(element, "Invalid " + FEATURE_ACTION + "=" + action + " defined. Valid values are: " + FEATURE_ACTION_BOTH + ", " + FEATURE_ACTION_SET + ", or " + FEATURE_ACTION_UNSET); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return;
- }
- EStructuralFeature feature = null;
- EList allFeatures = eClass.getEAllStructuralFeatures();
- EStructuralFeature tempFeature = null;
- Iterator iterator = allFeatures.iterator();
- while (null == feature && iterator.hasNext()) {
- tempFeature = (EStructuralFeature) iterator.next();
- if (tempFeature.getName().equals(featureName)) {
- feature = tempFeature;
- }
- }
- if (feature == null) {
- logError(element, FEATURE + " " + featureName + " can not be found in " + TYPE + " " + eClass.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return;
- }
- List factoryHolderList = (List) featureHash.get(feature);
- if (null == factoryHolderList) {
- factoryHolderList = new ArrayList();
- featureHash.put(feature, factoryHolderList);
- }
- FactoryHolder factoryHolder = new FactoryHolder(factoryElement, actionType);
- if (factoryHolderList.contains(factoryHolder)) {
- logError(element, "Duplicate" + FEATURE + ":" + featureName + " defined for " + FACTORY_CLASS + ":" + factoryElement.getAttribute(FACTORY_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return;
- }
- factoryHolderList.add(factoryHolder);
- }
-
- private String getFactoryHash(IConfigurationElement factoryElement) {
- return factoryElement.getDeclaringExtension().getNamespace() + factoryElement.getAttribute(FACTORY_CLASS);
- }
-
- public static void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getNamespace() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- Logger.getLogger().logError(buf.toString());
- }
-
- public static ModifierHelperRegistry getInstance() {
- if (null == INSTANCE) {
- INSTANCE = new ModifierHelperRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * returns a list of ModifierHelpers
- *
- * @param baseHelper
- * @param actionFlag
- * @return
- */
- public List getHelpers(ModifierHelper baseHelper) {
- int actionFlag = baseHelper.shouldUnsetValue() ? ModifierHelper.ACTION_UNSET : ModifierHelper.ACTION_SET;
- EStructuralFeature feature = baseHelper.getFeature();
- List factoryList = getFactories(feature, actionFlag);
- if (null == factoryList) {
- return null;
- }
- ArrayList helpers = new ArrayList();
- Iterator it = factoryList.iterator();
- ModifierHelperFactory factory = null;
- while (it.hasNext()) {
- factory = (ModifierHelperFactory) it.next();
- Object helper = factory.getHelper(baseHelper, actionFlag);
- if (null != helper) {
- helpers.add(helper);
- }
- }
- return helpers;
- }
-
- private List getFactories(EStructuralFeature feature, int actionFlag) {
- List factoryHolderList = (List) featureHash.get(feature);
- if (null == factoryHolderList) {
- return null;
- }
- List factoryList = new ArrayList();
- ModifierHelperFactory factory = null;
- for (int i = 0; i < factoryHolderList.size(); i++) {
- factory = ((FactoryHolder) factoryHolderList.get(i)).getFactory(actionFlag);
- if (null != factory) {
- factoryList.add(factory);
- }
- }
- return factoryList;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/OwnerProvider.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/OwnerProvider.java
deleted file mode 100644
index e082439..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/OwnerProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 10:24:46 PM)
- *
- * @author: Administrator
- */
-public interface OwnerProvider {
- /**
- * Return the EObject that will serve as the owner of a given J2EEModifierHelper.
- */
- EObject getOwner();
-
- /**
- * Return a J2EEModifierHelper for the owner if the owner does not yet exist.
- */
- ModifierHelper getOwnerHelper();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java
deleted file mode 100644
index 07a326e..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java
+++ /dev/null
@@ -1,57 +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
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ProjectResourceSetEditImpl extends ProjectResourceSetImpl {
-
- /**
- * @param aProject
- */
- public ProjectResourceSetEditImpl(IProject aProject) {
- super(aProject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl#createResource(org.eclipse.emf.common.util.URI)
- */
- public Resource createResource(URI uri, String contentType) {
- Resource result = super.createResource(uri, contentType);
- if (result != null && WorkbenchResourceHelper.isReferencedResource(result))
- WorkbenchResourceHelper.cacheSynchronizationStamp((ReferencedResource) result);
- return result;
- }
-
- public Resource createResource(URI uri) {
- return createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java
deleted file mode 100644
index 3718afe..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emfworkbench.integration;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-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.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ResourceSetWorkbenchEditSynchronizer extends ResourceSetWorkbenchSynchronizer implements IResourceDeltaVisitor {
- private static final String CLASS_EXTENSION = "class"; //$NON-NLS-1$
- private static final String JAVA_EXTENSION = "java"; //$NON-NLS-1$
- private static final String JAVA_ARCHIVE = "jar"; //$NON-NLS-1$
- private Set recentlySavedFiles = new HashSet();
- private Map ignoredFilesCache = new HashMap();
- private class SavedFileKey {
- private WeakReference res;
- private IFile savedFile;
- public SavedFileKey(Resource res, IFile savedFile) {
- super();
- this.res = new WeakReference(res);
- this.savedFile = savedFile;
- }
- public Resource getRes() {
- return this.res == null ? null : (Resource)res.get();
- }
- public void setRes(Resource res) {
- this.res = new WeakReference(res);
- }
- public IFile getSavedFile() {
- return savedFile;
- }
- public void setSavedFile(IFile savedFile) {
- this.savedFile = savedFile;
- }
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + getOuterType().hashCode();
- result = prime * result + ((getRes() == null) ? 0 : getRes().hashCode());
- result = prime * result + ((savedFile == null) ? 0 : savedFile.hashCode());
- return result;
- }
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SavedFileKey other = (SavedFileKey) obj;
- if (!getOuterType().equals(other.getOuterType()))
- return false;
- if (getRes() == null) {
- if (other.getRes() != null)
- return false;
- } else if (!getRes().equals(other.getRes()))
- return false;
- if (savedFile == null) {
- if (other.savedFile != null)
- return false;
- } else if (!savedFile.equals(other.savedFile))
- return false;
- return true;
- }
- private ResourceSetWorkbenchEditSynchronizer getOuterType() {
- return ResourceSetWorkbenchEditSynchronizer.this;
- }
- }
-
- /** The emf resources to be removed from the resource set as a result of a delta */
- protected List deferredRemoveResources = new ArrayList();
- protected List deferredUnloadResources = new ArrayList();
- protected List deferredLoadResources = new ArrayList();
-
- protected List autoloadResourcesURIs = new ArrayList();
- protected List autoloadResourcesExts = new ArrayList();
-
-
- /**
- * @param aResourceSet
- * @param aProject
- */
- public ResourceSetWorkbenchEditSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- super(aResourceSet, aProject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.ResourceSetWorkbenchSynchronizer#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- super.resourceChanged(event);
- try {
- acceptDelta(event);
- notifyExtendersIfNecessary();
- processDeferredResources();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- deferredRemoveResources.clear();
- deferredUnloadResources.clear();
- deferredLoadResources.clear();
- }
- }
-
- protected void processDeferredRemovedResources() {
- Resource resource = null;
- for (int i = 0; i < deferredRemoveResources.size(); i++) {
- resource = (Resource) deferredRemoveResources.get(i);
- resourceSet.getResources().remove(resource);
- resource.unload();
- }
- }
-
- protected void processDeferredUnloadedResources() {
- Resource resource = null;
- for (int i = 0; i < deferredUnloadResources.size(); i++) {
- resource = (Resource) deferredUnloadResources.get(i);
- resource.unload();
- }
- }
-
- private void processDeferredLoadResources() {
- URI uri = null;
- for (int i = 0; i < deferredLoadResources.size(); i++) {
- uri = (URI) deferredLoadResources.get(i);
- try {
- resourceSet.getResource(uri, true);
- } catch (WrappedException ex) {
- Logger.getLogger().logError(ex);
- }
-
- }
- }
-
- private ILock lock;
- private static final long delay = 30;
-
- private ILock getLock() {
- if (lock == null)
- lock = Platform.getJobManager().newLock();
- return lock;
- }
-
- private void releaseLock() {
- getLock().release();
- }
- private boolean aquireLock() throws InterruptedException{
- return getLock().acquire(delay);
- }
-
- protected void acceptDelta(final IResourceChangeEvent event) {
-
- boolean hasLocked = false;
- try {
- hasLocked = aquireLock();
- } catch (InterruptedException e) {
- Logger.getLogger().write(e);
- }
-
- try{
- final IResourceDelta delta = event.getDelta();
-
- if (ResourcesPlugin.getWorkspace().isTreeLocked()) {
- primAcceptDelta(delta, event);
- }
- else {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- primAcceptDelta(delta, event);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, project, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }finally{
- if( hasLocked )
- releaseLock();
- }
- }
-
- private void primAcceptDelta(IResourceDelta delta, IResourceChangeEvent event) {
- if (delta != null) {
- try {
- currentProjectDelta = null;
- delta.accept(ResourceSetWorkbenchEditSynchronizer.this);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * The project is going away so we need to cleanup ourself and the ResourceSet. TODO Need to
- * push up this code to ResourceSetWorkbenchSynchronizer in next release.
- */
- protected void release() {
- if (JEMUtilPlugin.isActivated()) {
- try {
- if (resourceSet instanceof ProjectResourceSet)
- ((ProjectResourceSet) resourceSet).release();
- } finally {
- EMFWorkbenchContextFactory.INSTANCE.removeCachedProject(getProject());
- dispose();
- }
- }
- }
-
- private void processDeferredResources() {
- processDeferredRemovedResources();
- processDeferredUnloadedResources();
- processDeferredLoadResources();
- }
-
- public boolean visit(IResourceDelta delta) {
- IResource resource = delta.getResource();
- // only respond to project changes
- if (resource != null) {
- if (resource.getType() == IResource.PROJECT) {
- IProject p = (IProject) resource;
- if (isInterrestedInProject(p)) {
- currentProjectDelta = delta;
- return true;
- }
- return false;
- }
- if (resource.getType() == IResource.FILE && isInterrestedInFile((IFile) resource)) {
- switch (delta.getKind()) {
- case IResourceDelta.REMOVED :
- removedResource((IFile) resource);
- break;
- case IResourceDelta.ADDED :
- addedResource((IFile) resource);
- break;
- case IResourceDelta.CHANGED :
- if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
- changedResource((IFile) resource);
- break;
- default :
- if ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0 || (delta.getFlags() & IResourceDelta.MOVED_TO) != 0)
- movedResource((IFile) resource);
- break;
- }
- return false;
- }
- }
- return true;
- }
-
- /**
- * Queue up the <code>Resource</code> that corresponds to <code>aFile</code>, for removal
- * from the cache of resources.
- *
- * @post Return true if a <code>Resource</code> was queued up to be removed.
- */
- protected boolean removedResource(IFile aFile) {
- return processResource(aFile, true);
- }
-
- /**
- * Queue up the <code>Resource</code> that corresponds to <code>aFile</code>, for reload.
- *
- * @post Return true if a <code>Resource</code> was queued up to be reloaded.
- */
- protected boolean addedResource(IFile aFile) {
- boolean didProcess = false;
- List resources = getResources(aFile);
- for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
- Resource resource = (Resource) iterator.next();
-
- if (resource != null) {
- if (recentlySavedFilesContains(resource)) {
-
- /*
- * The IFile was just added to the workspace but we have a
- * changed resource in memory. Need to decide if it should
- * be unloaded.
- */
- if (resource.isModified()) {
- if (WorkbenchResourceHelper.isReferencedResource(resource)) {
- ReferencedResource refRes = (ReferencedResource) resource;
- if (refRes.shouldForceRefresh()) {
- deferredUnloadResources.add(resource);
- didProcess = true;
- }
- }
- }
- } else {
- /* Unload if found and is not modified but inconsistent. */
- if (resource.isLoaded()) {
- if (WorkbenchResourceHelper.isReferencedResource(resource)) {
- if (!WorkbenchResourceHelper.isConsistent((ReferencedResource) resource)) {
- deferredUnloadResources.add(resource);
- didProcess = true;
- }
- } else {
- deferredUnloadResources.add(resource);
- didProcess = true;
- }
- } else {
- /* Process autoload resources on added file */
- URI uri = URI.createPlatformResourceURI(aFile.getFullPath().toString());
- if ((autoloadResourcesURIs.contains(uri)) || (autoloadResourcesExts.contains(aFile.getFileExtension()))) {
- deferredLoadResources.add(uri);
- didProcess = true;
- }
- }
- }
- }
- }
- return didProcess;
- }
-
- private synchronized boolean recentlySavedFilesContains(Resource resource) {
- for (Iterator iterator = recentlySavedFiles.iterator(); iterator.hasNext();) {
- SavedFileKey key = (SavedFileKey) iterator.next();
- if (key.getRes() != null && (key.getRes().getURI().equals(resource.getURI()) && key.getRes().getClass().equals(resource.getClass())))
- return true;
- }
- return false;
- }
-
- protected boolean processResource(IFile aFile, boolean isRemove) {
- List resources = getResources(aFile);
- for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
- Resource resource = (Resource) iterator.next();
- if ((resource != null)) {
- if (recentlySavedFilesContains(resource)) {
- if (resource.isModified()) {
- if (WorkbenchResourceHelper.isReferencedResource(resource)) {
- ReferencedResource refRes = (ReferencedResource) resource;
- if (!refRes.shouldForceRefresh())
- continue; // Do not do anything
- } else
- continue;
- }
- }
- if (isRemove)
- deferredRemoveResources.add(resource);
- else if (resource.isLoaded()) {
- if (WorkbenchResourceHelper.isReferencedResource(resource)) {
- if (!WorkbenchResourceHelper.isConsistent((ReferencedResource) resource))
- deferredUnloadResources.add(resource);
- } else
- deferredUnloadResources.add(resource);
- }
- }
- }
- return false;
- }
-
- /**
- * For now, do the same as if the <code>aFile</code> was removed.
- */
- protected boolean movedResource(IFile aFile) {
- return removedResource(aFile);
- }
-
- /**
- * The contents of <code>aFile</code> have changed in the Workbench and we may need to update
- * our cached resources.
- *
- * We will process this resource to be refreshed and not removed.
- *
- * @post Return true if a <code>Resource</code> was actually removed.
- */
-
- protected boolean changedResource(IFile aFile) {
- //Process resource as a refresh.
- return processResource(aFile, false);
- }
-
- protected Resource getResource(IFile aFile) {
-
- return resourceSet.getResource(URI.createPlatformResourceURI(aFile.getFullPath().toString()), false);
- }
-
- protected List getResources(IFile aFile) {
-
- List resources = new ArrayList();
- List allResources = resourceSet.getResources();
- for (Iterator iterator = allResources.iterator(); iterator.hasNext();) {
- Resource res = (Resource) iterator.next();
- URI resURI = res.getURI();
- String resURIString = "";
- if (resURI.path() != null) {
- IPath resURIPath;
- if (WorkbenchResourceHelper.isPlatformResourceURI(resURI))
- resURIPath = new Path(URI.decode(resURI.path())).removeFirstSegments(2);
- else
- resURIPath = new Path(URI.decode(resURI.path())).removeFirstSegments(1);
- resURIString = resURIPath.toString();
- }
- if (!resURIString.equals("") && aFile.getFullPath().toString().indexOf(resURIString) != -1)
- resources.add(res);
- }
- return resources;
- }
-
-
- /**
- * This method should be called prior to writing to an IFile from a MOF resource.
- */
- public void preSave(IFile aFile) {
- if (aFile != null) {
- recentlySavedFilesAdd(aFile,null);
- ignoredFilesCache.remove(aFile);
- }
- }
-
- /**
- * This method should be called prior to writing to an IFile from a MOF resource.
- */
- public void preSave(IFile aFile, Resource res) {
- if (aFile != null) {
- recentlySavedFilesAdd(aFile, res);
- ignoredFilesCache.remove(aFile);
- }
- }
-
- private synchronized boolean recentlySavedFilesAdd(IFile file, Resource res) {
- return recentlySavedFiles.add(new SavedFileKey(res, file));
- }
-
- /**
- * This method should be called after a preSave if the save fails
- */
- public void removeFromRecentlySavedList(IFile aFile) {
- if (aFile != null) {
- recentlySavedFilesForceRemove(aFile);
- ignoredFilesCache.remove(aFile);
- }
- }
-
- private synchronized boolean recentlySavedFilesRemove(IFile file) {
-
- boolean removedFromList = false;
- for (Iterator iterator = recentlySavedFiles.iterator(); iterator.hasNext();) {
- SavedFileKey key = (SavedFileKey) iterator.next();
- if (key.savedFile != null && key.savedFile.equals(file)) {
- List resources = getResources(file);
- if (key.getRes() == null || resources.contains(key.getRes()) ) {
- iterator.remove();
- removedFromList = true;
- }
- }
- }
- return removedFromList;
- }
- private synchronized boolean recentlySavedFilesForceRemove(IFile file) {
-
- boolean removedFromList = false;
- for (Iterator iterator = recentlySavedFiles.iterator(); iterator.hasNext();) {
- SavedFileKey key = (SavedFileKey) iterator.next();
- if (key.savedFile != null && key.savedFile.equals(file)) {
- iterator.remove();
- removedFromList = true;
- }
- }
- return removedFromList;
- }
-
- /**
- * This method should be called just after writing to an IFile from a MOF resource.
- *
- * @deprecated No longer needs to be called.
- */
- public void postSave(IFile aFile) {
- //TODO remove this method
- }
-
- /**
- * Return <code>true</code> if <code>aProject</code> has the projectNatureID.
- */
- protected boolean isInterrestedInProject(IProject aProject) {
- return aProject.equals(getProject());
- }
-
- /**
- * Optimized not to be not interrested in files with an extension of .java or .class or if the
- * file has just been saved by our own internal mechanism.
- */
- protected boolean isInterrestedInFile(IFile aFile) {
- String extension = aFile.getFileExtension();
- if (CLASS_EXTENSION.equals(extension) || JAVA_EXTENSION.equals(extension) || JAVA_ARCHIVE.equals(extension))
- return false;
- if (recentlySavedFilesRemove(aFile)) {
- cacheIgnored(aFile);
- return false;
- }
- return !hasIgnored(aFile);
- }
-
- /**
- * Return true if we have already ignored this <code>file</code> and that its modification
- * stamp is the same as when we processed it.
- *
- * @param file
- * @return
- */
- private boolean hasIgnored(IFile file) {
- Long cachedStamp = (Long) ignoredFilesCache.get(file);
- if (cachedStamp == null)
- return false;
- long stamp = WorkbenchResourceHelper.computeModificationStamp(file);
- return cachedStamp.longValue() == stamp;
- }
-
- /**
- * Cache the modification stamp of the <code>file</code>.
- *
- * @param file
- */
- private void cacheIgnored(IFile file) {
- long stamp = WorkbenchResourceHelper.computeModificationStamp(file);
- ignoredFilesCache.put(file, new Long(stamp));
- }
-
- public void enableAutoload(URI uri) {
- URI normalized = resourceSet.getURIConverter().normalize(uri);
- autoloadResourcesURIs.add(normalized);
- }
-
- public void disableAutoload(URI uri) {
- URI normalized = resourceSet.getURIConverter().normalize(uri);
- autoloadResourcesURIs.remove(normalized);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.ResourceSetWorkbenchSynchronizer#initialize()
- */
- protected void initialize() {
- getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE);
- }
- public void enableAutoload(String extension) {
- autoloadResourcesExts.add(extension);
-
- }
- public void disableAutoload(String extension) {
- autoloadResourcesExts.remove(extension);
- }
-
- public void dispose() {
- super.dispose();
- currentProjectDelta = null;
- extenders = null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/IValidateEditContext.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/IValidateEditContext.java
deleted file mode 100644
index e965900..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/IValidateEditContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 18, 2004
- */
-package org.eclipse.wst.common.internal.emfworkbench.validateedit;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-
-/**
- * @author jlanuti This is the abstraction layer for validate edit
- */
-public interface IValidateEditContext extends ResourceStateValidatorPresenter {
-
- public static final String CLASS_KEY = "ValidateEditContext"; //$NON-NLS-1$
-
- public void setEditModel(EditModel fValidator);
-
- public IStatus validateState(EditModel fValidator);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
deleted file mode 100644
index 4b8bc60..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateInputProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.validateedit;
-
-
-import java.util.List;
-
-public interface ResourceStateInputProvider {
- /**
- * Return true if any of the controlled resources or files has been modified.
- *
- * @return boolean
- */
- boolean isDirty();
-
- /**
- * Return a <code>List</code> of the MOF Resources that are being managed. Synchronization
- * checking will only work if you are using the emf.workbench plugin apis for loading resources.
- * This will ensure that you get an instance of a <code>ReferencedResource</code>. This
- * resource type is capable of caching its last known synchronization stamp that may be used to
- * test if the resource is consitent with the underlying IFile.
- *
- * @return List
- */
- List getResources();
-
- /**
- * Return a <code>List</code> of IFiles that are not MOF Resources that are also being
- * modified.
- *
- * @return List
- */
- List getNonResourceFiles();
-
- /**
- * Return a subset of the List from getNonResourceFiles() that are inconsistent with the
- * underlying java.io.File.
- *
- * @return List
- * @see ResourceStateInputProvider#getNonResourceFiles()
- */
- List getNonResourceInconsistentFiles();
-
- /**
- * It is the responsibility of the provider to cache the synchronization stamp for the List of
- * <code>roNonResourceFiles</code>. This stamp will be used to determine the inconsistent
- * files. This is only necessary of IFiles that are not MOF resources.
- *
- * @param roNonResourceFiles
- * @see ResourceStateInputProvider#getNonResourceInconsistentFiles()
- */
- void cacheNonResourceValidateState(List roNonResourceFiles);
-}
-
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidator.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidator.java
deleted file mode 100644
index ef337c4..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidator.java
+++ /dev/null
@@ -1,57 +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.internal.emfworkbench.validateedit;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-public interface ResourceStateValidator {
- static final IStatus OK_STATUS = new Status(IStatus.OK, JEMUtilPlugin.ID, 0, "", null); //$NON-NLS-1$
-
- /**
- * This method should be called whenever a <code>presenter</code> is activated (becomes
- * active). This will check the timestamps of the underlying files to see if they are different
- * from the last cached modified value. The <code>presenter</code> should be prepared to
- * prompt the user if they would like to refresh with the contents on disk if we are dirty.
- */
- void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException;
-
- /**
- * This method should be called whenever a <code>presenter</code> looses activation. This will
- * check the timestamps of the underlying files to see if they are different from the last
- * cached modified value. The <code>presenter</code> should be prepared to prompt the user if
- * they would like to refresh with the contents on disk if we are dirty.
- */
- void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException;
-
- /**
- * This method should be called the first time the files are about to be modified after a
- * <code>presenter</code> becomes active. The returned IStatus may have an ERROR status which
- * should be presented to the user.
- */
- IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException;
-
- /**
- * This method should be called prior to the <code>presenter</code> saving the modified
- * contents. This will check the consistency of the underlying files to ensure that they are
- * synchronized. If true is returned, the save can proceed.
- */
- boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException;
-
- /**
- * Return true if there are any read only files.
- */
- boolean checkReadOnly();
-}
-
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorImpl.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorImpl.java
deleted file mode 100644
index b00b6f9..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorImpl.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.validateedit;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-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.core.runtime.IStatus;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-public class ResourceStateValidatorImpl implements ResourceStateValidator {
- protected ResourceStateInputProvider provider;
- protected Map lastNonRefreshStateMap;
- protected boolean isCheckingConsistency;
-
- class RefreshRunnable implements IWorkspaceRunnable {
- CoreException thrownException;
- List files;
- List resources;
-
- RefreshRunnable(List someFiles, List inconsistentResources) {
- files = someFiles;
- resources = inconsistentResources;
- }
-
- public CoreException getThrownException() {
- return thrownException;
- }
-
- public void run(IProgressMonitor aMonitor) {
- try {
- prepareResourcesForRefresh(resources);
- primRefreshFiles(files);
- } catch (CoreException e) {
- thrownException = e;
- }
- }
- }
-
- /**
- * Constructor for ResourceStateValidator.
- */
- public ResourceStateValidatorImpl(ResourceStateInputProvider aProvider) {
- provider = aProvider;
- }
-
- /**
- * This method should be called whenever <code>aListener</code> is activated (becomes active).
- * This will check the timestamps of the underlying files to see if they are different from the
- * last cached modified value. <code>aListener</code> should be prepared to prompt the user if
- * they would like to refresh with the contents on disk if we are dirty.
- */
- public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- checkConsistency(presenter);
- }
-
- public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- checkConsistency(presenter);
- }
-
- public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
- if (presenter == null)
- return false;
- if (!provider.isDirty())
- return false;
- List inconsistentResources = getInconsistentResources();
- List inconsistentFiles = getFiles(inconsistentResources);
- inconsistentFiles = addOtherInconsistentFiles(inconsistentFiles);
- if (inconsistentFiles == null || inconsistentFiles.isEmpty())
- return true;
- return presenter.promptForInconsistentFileOverwrite(inconsistentFiles);
- }
-
- /**
- * @see ResourceStateValidator#checkReadOnly()
- */
- public boolean checkReadOnly() {
- boolean result = checkReadOnlyResources();
- if (!result)
- result = checkReadOnlyNonResourceFiles();
- return result;
- }
-
- /**
- * Method checkReadOnlyNonResourceFiles.
- *
- * @return boolean
- */
- private boolean checkReadOnlyNonResourceFiles() {
- List files = provider.getNonResourceFiles();
- if (files == null || files.isEmpty())
- return false;
- int size = files.size();
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) files.get(i);
- if (file.isReadOnly())
- return true;
- }
- return false;
- }
-
- /**
- * Method checkReadOnlyResources.
- *
- * @return boolean
- */
- private boolean checkReadOnlyResources() {
- List resources = provider.getResources();
- if (resources == null || resources.isEmpty())
- return false;
- int size = resources.size();
- Resource res = null;
- IFile file = null;
- for (int i = 0; i < size; i++) {
- res = (Resource) resources.get(i);
- file = WorkbenchResourceHelper.getFile(res);
- if (file != null && file.isReadOnly())
- return true;
- }
- return false;
- }
-
- protected void checkConsistency(ResourceStateValidatorPresenter presenter) throws CoreException {
- if (isCheckingConsistency || presenter == null)
- return;
- isCheckingConsistency = true;
- try {
- List inconsistentResources = getInconsistentResources();
- List inconsistentFiles = getFiles(inconsistentResources);
- inconsistentFiles = addOtherInconsistentFiles(inconsistentFiles);
- if (inconsistentFiles == null || inconsistentFiles.isEmpty())
- return;
- boolean shouldRefreshFiles = true;
- //Defect 208654 & 209631 want prompt no matter what.
- if (anyFileChangedSinceLastRefreshPrompt(inconsistentFiles)) {
- clearLastNonRefreshStateMap();
- shouldRefreshFiles = presenter.promptForInconsistentFileRefresh(inconsistentFiles);
- } else
- return;
- if (shouldRefreshFiles)
- refreshFiles(inconsistentFiles, inconsistentResources);
- else
- cacheLastNonRefreshFileStamps(inconsistentFiles);
- } finally {
- isCheckingConsistency = false;
- }
- }
-
- /**
- * Method cacheLastNonRefreshFileStamps.
- *
- * @param inconsistentFiles
- */
- private void cacheLastNonRefreshFileStamps(List inconsistentFiles) {
- if (inconsistentFiles != null && !inconsistentFiles.isEmpty()) {
- Map map = getLastNonRefreshStateMap();
- IFile file = null;
- long stamp = 0;
- for (int i = 0; i < inconsistentFiles.size(); i++) {
- file = (IFile) inconsistentFiles.get(i);
- stamp = WorkbenchResourceHelper.computeModificationStamp(file);
- map.put(file, new Long(stamp));
- }
- }
- }
-
- /**
- * Method cacheValidateState.
- *
- * @param result
- */
- private void cacheValidateState(IStatus aStatus, List readOnlyResources, List roNonResourceFiles) {
- if (aStatus.isOK()) {
- if (readOnlyResources != null && !readOnlyResources.isEmpty()) {
- ReferencedResource res = null;
- for (int i = 0; i < readOnlyResources.size(); i++) {
- res = (ReferencedResource) readOnlyResources.get(i);
- WorkbenchResourceHelper.setSynhronizationStamp(res, computeModificationStamp(res));
- }
- }
- provider.cacheNonResourceValidateState(roNonResourceFiles);
- }
- }
-
- private void clearLastNonRefreshStateMap() {
- if (lastNonRefreshStateMap != null)
- lastNonRefreshStateMap.clear();
- }
-
- /**
- * Method anyFileChangedSinceLastRefreshPrompt.
- *
- * @param inconsistentFiles
- * @return boolean
- */
- private boolean anyFileChangedSinceLastRefreshPrompt(List inconsistentFiles) {
- if (inconsistentFiles == null || inconsistentFiles.isEmpty())
- return false;
- if (lastNonRefreshStateMap == null || lastNonRefreshStateMap.isEmpty())
- return true;
- int size = inconsistentFiles.size();
- IFile file = null;
- Long stamp = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) inconsistentFiles.get(i);
- stamp = (Long) getLastNonRefreshStateMap().get(file);
- if (stamp == null || (stamp.longValue() != WorkbenchResourceHelper.computeModificationStamp(file)))
- return true;
- }
- return false;
- }
-
- protected List addOtherInconsistentFiles(List inconsistentFiles) {
- if (inconsistentFiles == null || inconsistentFiles.isEmpty())
- return getNonResourceInconsistentFiles();
- List nonResFiles = getNonResourceInconsistentFiles();
- if (nonResFiles != null)
- inconsistentFiles.addAll(nonResFiles);
- return inconsistentFiles;
- }
-
- /**
- * Method getNonResourceInconsistentFiles.
- *
- * @return List
- */
- private List getNonResourceInconsistentFiles() {
- List files = provider.getNonResourceInconsistentFiles();
- if (files != null && !files.isEmpty())
- return files;
- //Determine consistency based on the synchronization of the IFile
- files = provider.getNonResourceFiles();
- if (files == null || files.isEmpty())
- return Collections.EMPTY_LIST;
- List inconsistent = null;
- int size = files.size();
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) files.get(i);
- if (file.isAccessible() && !file.isSynchronized(IResource.DEPTH_ZERO)) {
- if (inconsistent == null)
- inconsistent = new ArrayList();
- inconsistent.add(file);
- }
- }
- if (inconsistent == null)
- inconsistent = Collections.EMPTY_LIST;
- return inconsistent;
- }
-
- protected List getInconsistentResources() {
- List mofResources = provider.getResources();
- List inconsistent = null;
- int size = mofResources.size();
- Resource res = null;
- ReferencedResource refRes = null;
- for (int i = 0; i < size; i++) {
- res = (Resource) mofResources.get(i);
- if (WorkbenchResourceHelper.isReferencedResource(res)) {
- refRes = (ReferencedResource) res;
- if (!WorkbenchResourceHelper.isConsistent(refRes) && (refRes.isLoaded() && !refRes.isNew())) {
- if (inconsistent == null)
- inconsistent = new ArrayList();
- inconsistent.add(refRes);
- }
- }
- }
- if (inconsistent == null)
- inconsistent = Collections.EMPTY_LIST;
- return inconsistent;
- }
-
- protected List getFiles(List refResources) {
- List files = new ArrayList(refResources.size());
- IFile file = null;
- ReferencedResource refRes = null;
- for (int i = 0; i < refResources.size(); i++) {
- refRes = (ReferencedResource) refResources.get(i);
- file = WorkbenchResourceHelper.getFile(refRes);
- if (file != null)
- files.add(file);
- }
- return files;
- }
-
- /**
- * This method should be called at least the first time a ResourceStateValidatorPresenter
- * becomes active and is about to edit its contents. The returned IStatus may have an ERROR
- * status which should be presented to the user.
- */
- public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
- List roResources, nonResROFiles, roFiles = null;
- List[] readOnly = selectReadOnlyResources(provider.getResources());
- roResources = readOnly[0];
- roFiles = readOnly[1];
- nonResROFiles = selectReadOnlyFiles(provider.getNonResourceFiles());
- if (nonResROFiles != null) {
- if (roFiles == null)
- roFiles = nonResROFiles;
- else
- roFiles.addAll(nonResROFiles);
- }
- if (roFiles == null || roFiles.isEmpty())
- return OK_STATUS;
- IFile[] files = new IFile[roFiles.size()];
- roFiles.toArray(files);
- Object ctx = presenter != null ? presenter.getValidateEditContext() : null;
- IStatus result = ResourcesPlugin.getWorkspace().validateEdit(files, ctx);
- cacheValidateState(result, roResources, nonResROFiles);
- if (!result.isOK())
- checkConsistency(presenter);
- return result;
- }
-
- /**
- * Method selectReadOnlyFiles.
- *
- * @param list
- * @param roFiles
- */
- private List selectReadOnlyFiles(List files) {
- if (files == null || files.isEmpty())
- return files;
- int size = files.size();
- List readOnly = null;
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) files.get(i);
- if (file.isReadOnly()) {
- if (readOnly == null)
- readOnly = new ArrayList(size);
- readOnly.add(file);
- }
- }
- return readOnly;
- }
-
- /**
- * Method selectReadOnlyResources.
- *
- * @param list
- * @param roFiles
- * @return List
- */
- private List[] selectReadOnlyResources(List resources) {
- if (resources == null || resources.isEmpty())
- return new List[]{resources, null};
- IFile file = null;
- int size = resources.size();
- Resource res = null;
- List readOnly = null;
- List roFiles = null;
- for (int i = 0; i < size; i++) {
- res = (Resource) resources.get(i);
- file = WorkbenchResourceHelper.getFile(res);
- if (file != null && file.isReadOnly()) {
- if (readOnly == null)
- readOnly = new ArrayList(size);
- readOnly.add(res);
- if (roFiles == null)
- roFiles = new ArrayList(size);
- roFiles.add(file);
- }
- }
- return new List[]{readOnly, roFiles};
- }
-
- protected long computeModificationStamp(ReferencedResource resource) {
- return WorkbenchResourceHelper.computeModificationStamp(resource);
- }
-
-
- protected void refreshFiles(List someFiles, List inconsitentResources) throws CoreException {
- RefreshRunnable runnable = new RefreshRunnable(someFiles, inconsitentResources);
- ResourcesPlugin.getWorkspace().run(runnable, null);
- if (runnable.getThrownException() != null)
- throw runnable.getThrownException();
- }
-
- protected void primRefreshFiles(List someFiles) throws CoreException {
- int size = someFiles.size();
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) someFiles.get(i);
- if (!file.isSynchronized(IResource.DEPTH_ZERO))
- file.refreshLocal(IResource.DEPTH_ONE, null);
- else
- refreshResource(file);
- }
- }
-
- /**
- * We need to remove the Resource that corresponds to the <code>file</code> to force a
- * refresh.
- */
- protected void refreshResource(IFile file) {
- Resource res = WorkbenchResourceHelperBase.getResource(file);
- if (res != null)
- res.unload();
- }
-
- /**
- * Force the resources to not be dirty to ensure that they will be removed from their
- * ResourceSet when their file is refreshed.
- */
- protected void prepareResourcesForRefresh(List refResources) {
- ReferencedResource res = null;
- for (int i = 0; i < refResources.size(); i++) {
- res = (ReferencedResource) refResources.get(i);
- res.setForceRefresh(true);
- }
- }
-
- /**
- * Gets the lastNonRefreshStateMap.
- *
- * @return Returns a Map
- */
- protected Map getLastNonRefreshStateMap() {
- if (lastNonRefreshStateMap == null)
- lastNonRefreshStateMap = new HashMap();
- return lastNonRefreshStateMap;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
deleted file mode 100644
index 47545d3..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ResourceStateValidatorPresenter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emfworkbench.validateedit;
-
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-
-public interface ResourceStateValidatorPresenter {
- /**
- * Present to the user that the <code>inconsistentFiles</code> will need to be refreshed in
- * the workbench. Return true if the refresh should occur. The List will be a list of IFiles.
- *
- * @param inconsistentFiles
- * @return boolean
- */
- boolean promptForInconsistentFileRefresh(List inconsistentFiles);
-
- /**
- * Return the context (Shell) that would be passed to the validateEdit method. If this method
- * returns null, a prompt to check out code will not be presented to the user.
- *
- * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[],
- * java.lang.Object)
- */
- Object getValidateEditContext();
-
- /**
- * Present a dialog to the user that indicates that the user is about to save and overwrite the
- * list of <code>inconsitentFiles</codes>. Return true if
- * the overwrite should proceed. The list of <code>inconsitentFiles</codes> will
- * be a list of IFiles.
- * @param inconsistentFiles
- * @return boolean
- */
- boolean promptForInconsistentFileOverwrite(List inconsistentFiles);
-
- /**
- * This method should be called by any action that is about to edit any contents of any IFile.
- */
- public IStatus validateState();
-}
-
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ValidateEditHeadlessContext.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ValidateEditHeadlessContext.java
deleted file mode 100644
index 11efe03..0000000
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/validateedit/ValidateEditHeadlessContext.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 18, 2004
- */
-package org.eclipse.wst.common.internal.emfworkbench.validateedit;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-
-/**
- * @author jlanuti Headless Validate Edit Context Implementation
- */
-public class ValidateEditHeadlessContext implements IValidateEditContext {
-
- protected boolean fNeedsStateValidation = true;
- protected boolean fMessageUp = false;
- protected EditModel fValidator = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext#validateState()
- */
- public IStatus validateState() {
- // For now do nothing in headless state
- return Status.OK_STATUS;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#getValidateEditContext()
- */
- public Object getValidateEditContext() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileOverwrite(java.util.List)
- */
- public boolean promptForInconsistentFileOverwrite(List inconsistentFiles) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileRefresh(java.util.List)
- */
- public boolean promptForInconsistentFileRefresh(List inconsistentFiles) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * @see IValidateEditListener#setNeedsStateValidation(boolean)
- */
- public void setNeedsStateValidation(boolean needsStateValidation) {
- fNeedsStateValidation = needsStateValidation;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext#setEditModel(org.eclipse.wst.common.internal.emfworkbench.integration.EditModel)
- */
- public void setEditModel(EditModel fValidator) {
- this.fValidator = fValidator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext#validateState(org.eclipse.wst.common.internal.emfworkbench.integration.EditModel)
- */
- public IStatus validateState(EditModel editModel) {
- setEditModel(editModel);
- return validateState();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath b/plugins/org.eclipse.wst.common.modulecore.ui/.classpath
similarity index 77%
rename from plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
rename to plugins/org.eclipse.wst.common.modulecore.ui/.classpath
index 065ac06..64c5e31 100644
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project b/plugins/org.eclipse.wst.common.modulecore.ui/.project
similarity index 92%
rename from plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
rename to plugins/org.eclipse.wst.common.modulecore.ui/.project
index 5e29c82..4977ea7 100644
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.perfmsr.core</name>
+ <name>org.eclipse.wst.common.modulecore.ui</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 74%
rename from plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs
rename to plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs
index 46468f9..44d82f6 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,21 +1,25 @@
-#Sat Mar 24 02:06:45 EDT 2007
+#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.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+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=warning
+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=warning
+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
@@ -27,17 +31,21 @@
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=ignore
+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
@@ -47,16 +55,20 @@
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=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.3
+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
new file mode 100644
index 0000000..120ec39
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+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.2.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.1.300,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.emfworkbench.integration/about.html b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
similarity index 98%
rename from plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
rename to plugins/org.eclipse.wst.common.modulecore.ui/about.html
index 2199df3..b6ed5b0 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/about.html
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
@@ -10,7 +10,7 @@
<H3>About This Content</H3>
-<P>June, 2008</P>
+<P>August, 2009</P>
<H3>License</H3>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties b/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
similarity index 84%
rename from plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
rename to plugins/org.eclipse.wst.common.modulecore.ui/build.properties
index a288ad7..ef0787e 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
+# 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
@@ -8,11 +8,11 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source.. = src/,\
- property_file/
+source.. = src/
output.. = bin/
bin.includes = plugin.xml,\
.,\
+ icons/,\
META-INF/,\
about.html,\
plugin.properties
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
new file mode 100644
index 0000000..6628af8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/icons/assembly-banner.png
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
new file mode 100644
index 0000000..c91b267
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/icons/folder.gif
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
new file mode 100644
index 0000000..ec315d5
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/icons/jar_obj.gif
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
new file mode 100644
index 0000000..a4ea580
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/icons/prj_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
similarity index 65%
rename from plugins/org.eclipse.wst.validation.ui/plugin.properties
rename to plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
index b8d12f2..a963071 100644
--- a/plugins/org.eclipse.wst.validation.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
+# 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
@@ -8,12 +8,8 @@
# 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.org
+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
new file mode 100644
index 0000000..21c635e
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.xml
@@ -0,0 +1,51 @@
+<?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.validation/xsds/validationSelectionHandler.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
similarity index 61%
rename from plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
rename to plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
index acffbfa..36e2203 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
@@ -1,19 +1,24 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
+<schema targetNamespace="org.eclipse.wst.common.modulecore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validationSelectionHandler" name="Validation Selection Handler"/>
+ <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="validationSelectionHandler" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="verifier"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
@@ -39,26 +44,43 @@
</complexType>
</element>
- <element name="validationSelectionHandler">
+ <element name="verifier">
<complexType>
- <attribute name="id" type="string" use="required">
+ <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>
- <attribute name="handlerClass" type="string" use="required">
+ </complexType>
+ </element>
+
+ <element name="component">
+ <complexType>
+ <attribute name="component_type" type="string" use="required">
<annotation>
<documentation>
- The class must implement the IValidationSelectionHandler interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="selectionType" type="string" use="required">
- <annotation>
- <documentation>
-
+ the supported component type for this verifier(uses facet id)
</documentation>
</annotation>
</attribute>
@@ -74,39 +96,15 @@
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
<annotation>
<appInfo>
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
+ 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
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
new file mode 100644
index 0000000..7562a68
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
@@ -0,0 +1,108 @@
+<?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>
+ </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>
+ </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>
+ </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
new file mode 100644
index 0000000..e320384
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/referenceWizardFragment.exsd
@@ -0,0 +1,138 @@
+<?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
new file mode 100644
index 0000000..38b775a
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
@@ -0,0 +1,97 @@
+<?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
new file mode 100644
index 0000000..07d87a8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/virtualComponentLabelProvider.exsd
@@ -0,0 +1,109 @@
+<?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
new file mode 100644
index 0000000..de61006
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/internal/impl/TaskModel.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..f526c66
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/IModuleCoreUIContextIds.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..3d3c3c1
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * 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 Revert;
+
+ 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
new file mode 100644
index 0000000..2734514
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java
@@ -0,0 +1,174 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..941d375
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Trace.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..2c93a37
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/AddFolderDialog.java
@@ -0,0 +1,151 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..8a0997c
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
@@ -0,0 +1,167 @@
+/******************************************************************************
+ * 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.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 ) {
+ return ((ComponentResourceProxy)element).runtimePath.toString();
+ }
+ }
+ if( element instanceof IVirtualReference) {
+ if (columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN) {
+ return handleSourceText(((IVirtualReference)element).getReferencedComponent());
+ } else if (columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
+ return AddModuleDependenciesPropertiesPage.getSafeRuntimePath((IVirtualReference)element);
+ }
+ }
+ 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 ? null : 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
new file mode 100644
index 0000000..c05df3d
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
@@ -0,0 +1,277 @@
+/******************************************************************************
+ * 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 DependencyPageExtensionManager manager = null;
+ public static DependencyPageExtensionManager getManager() {
+ if( manager == null )
+ manager = new DependencyPageExtensionManager();
+ return manager;
+ }
+
+ private HashMap<String, IDependencyPageProvider> providers = null;
+
+ public IDependencyPageProvider getProvider(IFacetedProject project) {
+ if( providers == null )
+ loadProviders();
+ Iterator<IDependencyPageProvider> i = providers.values().iterator();
+ IDependencyPageProvider temp;
+ while(i.hasNext()) {
+ temp = i.next();
+ if( temp.canHandle(project))
+ return temp;
+ }
+ return null;
+ }
+
+ private void loadProviders() {
+ HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>();
+ 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$
+ } catch( CoreException ce )
+ {
+ ModuleCoreUIPlugin.log( ce );
+ }
+ }
+ providers = temp;
+ }
+
+ 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
new file mode 100644
index 0000000..aedeb13
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
@@ -0,0 +1,187 @@
+/******************************************************************************
+ * 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 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.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.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;
+ if(!isComplete) {
+ isComplete = true;
+ handle.update();
+ }
+ }
+ }
+ };
+ }
+
+ 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
new file mode 100644
index 0000000..eb00ab3
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IReferenceEditor.java
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..6007c03
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IVirtualComponentLabelProvider.java
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..676fce5
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceRootWizardFragment.java
@@ -0,0 +1,184 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..1a96473
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceWizard.java
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..ff38a4d
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java
@@ -0,0 +1,230 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..9f4c316
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ResourceMappingFilterExtensionRegistry.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..7cc4832
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/AbstractDeploymentAssemblyVerifier.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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/DeploymentAssemblyVerifierData.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
new file mode 100644
index 0000000..c183835
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..f73b46b
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * 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);
+ 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
+ */
+ private 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
new file mode 100644
index 0000000..a3576b9
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/IDeploymentAssemblyVerifier.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..0af3524
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * 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.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) {
+
+ String runtimeID = null;
+ if (runtime == null)
+ runtimeID = "None"; //$NON-NLS-1$
+ else
+ runtimeID = runtime.getRuntimeType().getId();
+ List verifiers = getVerifiers(facetTypeID, runtimeID);
+ if (verifiers == null)
+ return Collections.EMPTY_LIST;
+ return verifiers;
+ }
+
+
+}
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
new file mode 100644
index 0000000..0a454d3
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistryReader.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..58f763d
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/IWizardHandle.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..78a2410
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizard.java
@@ -0,0 +1,587 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..ded4661
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizardPage.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..e7c9635
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WizardFragment.java
@@ -0,0 +1,244 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..4447e53
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WorkspaceRunnableAdapter.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..4f1791e
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
@@ -0,0 +1,28 @@
+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=&Add...
+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
+Revert=Re&vert
\ No newline at end of file
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
new file mode 100644
index 0000000..17fb851
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
@@ -0,0 +1,1156 @@
+/******************************************************************************
+ * 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
+ *
+ * API in these packages is provisional in this release
+ ******************************************************************************/
+package org.eclipse.wst.common.componentcore.ui.propertypage;
+
+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.ColumnWeightData;
+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.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.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.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.VirtualReference;
+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 implements Listener,
+ IModuleDependenciesControl, 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));
+ else {
+ IPath path2 = new Path(newPath == null ? "/" : newPath);
+ ref.setRuntimePath(path2.segmentCount() > 1 ? path2.removeLastSegments(1) : new Path("/"));
+ ref.setArchiveName(path2.segmentCount() > 0 ? path2.lastSegment() : "");
+ }
+ }
+
+ /**
+ * 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 getSafeRuntimePath((IVirtualReference)element);
+ } else if( element instanceof ComponentResourceProxy) {
+ return ((ComponentResourceProxy)element).runtimePath.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)
+ components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, (String)value);
+ } else if( item.getData() instanceof ComponentResourceProxy) {
+ ComponentResourceProxy c = ((ComponentResourceProxy)item.getData());
+ c.runtimePath = new Path((String)value);
+ resourceMappingsChanged = true;
+ if(tableIndex >= 0)
+ components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, (String)value);
+ }
+ 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;
+ }
+ }
+
+ 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);
+
+ // 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);
+
+ TreeColumn bndColumn = new TreeColumn(tree, SWT.NONE, DEPLOY_COLUMN);
+ bndColumn.setText(Messages.DeployPathColumn);
+ bndColumn.setResizable(true);
+
+ tableLayout.layout(tree, true);
+ 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() {
+ ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
+ allMappings.addAll(resourceMappings);
+ allMappings.addAll(hiddenMappings);
+
+ IStatus status = DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
+ // Clear the messages
+ propPage.setErrorMessage(null);
+ propPage.setMessage(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);
+ 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()
+ ));
+ }
+ ComponentResource[] onlyHiddenMappings = findOnlyHiddenMappings();
+ for( int i = 0; i < onlyHiddenMappings.length; i++ ) {
+ hiddenMappings.add(new ComponentResourceProxy(
+ onlyHiddenMappings[i].getSourcePath(), onlyHiddenMappings[i].getRuntimePath()
+ ));
+ }
+ 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 ComponentResourceProxy(IPath source, IPath runtimePath) {
+ this.source = source;
+ this.runtimePath = runtimePath;
+ }
+ }
+
+ /*
+ * 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()
+ ));
+ }
+ 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();
+ 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);
+ }
+ }
+ 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
new file mode 100644
index 0000000..47332e2
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IDependencyPageProvider.java
@@ -0,0 +1,63 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..d6ca4c8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IModuleDependenciesControl.java
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..11d8ce1
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IReferenceWizardConstants.java
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * 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
new file mode 100644
index 0000000..c7214e8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
@@ -0,0 +1,195 @@
+/******************************************************************************
+ * 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 org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.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];
+
+ 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 Label label = new Label( c, SWT.NONE );
+ 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));
+ return provider.createRootControl(facetedProject, controls, parent);
+ }
+
+ if( ComponentCore.createComponent(project) == null )
+ return getVirtCompErrorComposite(parent);
+
+ AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this);
+ controls = new IModuleDependenciesControl[1];
+ controls[0] = page;
+ return page.createContents(parent);
+ } catch( CoreException ce ) {
+ }
+ }
+ return getFacetErrorComposite(parent);
+ }
+
+ public void createControl(Composite parent){
+ super.createControl(parent);
+ getDefaultsButton().setText(Messages.Revert);
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index c8f6188..61b1105 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.1.207.qualifier
+Bundle-Version: 1.2.3.qualifier
Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.common.componentcore,
@@ -11,10 +11,12 @@
org.eclipse.wst.common.componentcore.datamodel.properties,
org.eclipse.wst.common.componentcore.internal;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.builder;x-internal:=true,
+ org.eclipse.wst.common.componentcore.internal.flat;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.impl;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.operation;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.resources;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.util;x-internal:=true,
+ org.eclipse.wst.common.componentcore.resolvers;x-internal:=true,
org.eclipse.wst.common.componentcore.resources
Require-Bundle: 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)",
@@ -30,5 +32,6 @@
org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.200,2.0.0)",
org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.common.modulecore/javadoc-images/componentCore.xsd b/plugins/org.eclipse.wst.common.modulecore/javadoc-images/componentCore.xsd
index a2d8828..f6c87e9 100644
--- a/plugins/org.eclipse.wst.common.modulecore/javadoc-images/componentCore.xsd
+++ b/plugins/org.eclipse.wst.common.modulecore/javadoc-images/componentCore.xsd
@@ -31,6 +31,9 @@
<attribute name="handle"
type="string" use="required">
</attribute>
+ <attribute name="archiveName"
+ type="string" use="optional">
+ </attribute>
<attribute name="deploy-path"
type="string" use="required">
</attribute>
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
index 55b628e..d307f4a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/modulecore.properties
@@ -8,4 +8,4 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-NEEDSMIGRATING=This project needs to migrate WTP metadata
\ No newline at end of file
+NEEDSMIGRATING=This project needs to migrate metadata
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
index 77cca57..eee7b8a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
@@ -415,13 +415,13 @@
protected String getContentTypeDescriber() {
if (isProjectOfType(project, IModuleConstants.JST_EJB_MODULE))
- return "org.eclipse.jst.j2ee.ejbDD";
+ return "org.eclipse.jst.j2ee.ejbDD"; //$NON-NLS-1$
if (isProjectOfType(project, IModuleConstants.JST_WEB_MODULE))
- return "org.eclipse.jst.j2ee.webDD";
+ return "org.eclipse.jst.j2ee.webDD"; //$NON-NLS-1$
if (isProjectOfType(project, IModuleConstants.JST_EAR_MODULE))
- return "org.eclipse.jst.j2ee.earDD";
+ return "org.eclipse.jst.j2ee.earDD"; //$NON-NLS-1$
if (isProjectOfType(project, IModuleConstants.JST_APPCLIENT_MODULE))
- return "org.eclipse.jst.j2ee.appclientDD";
+ return "org.eclipse.jst.j2ee.appclientDD"; //$NON-NLS-1$
return null;
}
@@ -476,7 +476,7 @@
public void saveIfNecessary(IProgressMonitor aMonitor) {
if (isReadOnly())
throwAttemptedReadOnlyModification();
- else if (validateEdit().isOK())
+ else if (artifactEditModel.isDirty() && validateEdit().isOK())
artifactEditModel.saveIfNecessary(aMonitor, this);
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ComponentCore.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ComponentCore.java
index 062a5e5..36e4a5c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ComponentCore.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ComponentCore.java
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeNode;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile;
@@ -114,6 +115,21 @@
}
/**
+ * Return an IVirtualComponent with the given name (aComponentName)
+ * and the given runtime path (path)
+ *
+ * @param aComponentName
+ * A name to identify the component, the name can be
+ * lib/<Absolute path of a jar> or
+ * var/<CLASSPATH_VARIABLE/library namer>
+ * @return A handle to an IVirtualComponent that may or may not exist.
+ * @see org.eclipse.core.runtime.IProgressMonitor#create(int, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public static IVirtualComponent createArchiveComponent(IProject aProject, String aComponentName, IPath runtimePath) {
+ return ComponentImplManager.instance().createArchiveComponent(aProject, aComponentName, runtimePath);
+ }
+
+ /**
* Return an IVirtualFolder with a runtime path specified by aRuntimePath
* contained by aProject, in a component named aComponentName. The resultant
* IVirtualFolder may or may not exist.
@@ -201,7 +217,7 @@
}
}
} catch (UnresolveableURIException e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
} finally {
if (se != null) {
se.dispose();
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
index a3704cf..ab96853 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
@@ -229,14 +229,14 @@
description.setNatureIds(newNatureIds);
aProject.setDescription(description, aMonitor);
} catch (CoreException e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
} finally {
manager.endRule(root);
}
if (aMonitor != null)
aMonitor.done();
} catch (CoreException e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
/* Return the new nature */
return getModuleCoreNature(aProject);
@@ -269,15 +269,10 @@
ModuleStructuralModel editModel = (ModuleStructuralModel)getEmfContext().getExistingEditModel(ModuleStructuralModelFactory.MODULE_STRUCTURAL_MODEL_ID, null,true);
if (editModel == null) {
editModel = (ModuleStructuralModel)EditModelRegistry.getInstance().createEditModelForRead(ModuleStructuralModelFactory.MODULE_STRUCTURAL_MODEL_ID, getEmfContext(), null);
- synchronized (editModel) {
- getEmfContext().cacheEditModel(editModel, null);
- editModel.access(anAccessorKey);
- }
- } else {
- synchronized (editModel) {
- editModel.access(anAccessorKey);
- }
- }
+ getEmfContext().cacheEditModel(editModel, null);
+ editModel.access(anAccessorKey);
+ } else
+ editModel.access(anAccessorKey);
return editModel;
}
@@ -308,15 +303,12 @@
ModuleStructuralModel editModel = (ModuleStructuralModel)getEmfContext().getExistingEditModel(ModuleStructuralModelFactory.MODULE_STRUCTURAL_MODEL_ID, null,false);
if (editModel == null) {
editModel = (ModuleStructuralModel)EditModelRegistry.getInstance().createEditModelForWrite(ModuleStructuralModelFactory.MODULE_STRUCTURAL_MODEL_ID, getEmfContext(), null);
- synchronized (editModel) {
- getEmfContext().cacheEditModel(editModel, null);
- editModel.access(anAccessorKey);
- }
- } else {
- synchronized (editModel) {
- editModel.access(anAccessorKey);
- }
- }
+ getEmfContext().cacheEditModel(editModel, null);
+ editModel.access(anAccessorKey);
+
+ } else
+ editModel.access(anAccessorKey);
+
return editModel;
}
@@ -549,7 +541,8 @@
// addAdapterFactories(set);
// set.getSynchronizer().addExtender(this); // added so we can be informed of closes to the
// new J2EEResourceDependencyRegister(set); // This must be done after the URIConverter is
- projectResourceSet.getSynchronizer().addExtender(this); // added so we can be informed of closes
+ if(projectResourceSet.getSynchronizer() != null)
+ projectResourceSet.getSynchronizer().addExtender(this); // added so we can be informed of closes
cacheModuleStructuralModels();
}
@@ -609,11 +602,11 @@
private void cacheModuleStructuralModels() {
if (cachedWriteHandle == null)
cachedWriteHandle = getModuleStructuralModelForWrite(this);
- if (cachedReadHandle == null)
- cachedReadHandle = getModuleStructuralModelForRead(this);
+ //if (cachedReadHandle == null)
+ // cachedReadHandle = getModuleStructuralModelForRead(this);
}
- protected String getPluginID() {
+ public String getPluginID() {
return MODULE_PLUG_IN_ID;
}
@@ -646,8 +639,8 @@
if (delta.getKind() == IResourceDelta.OPEN) {
if (cachedWriteHandle == null)
cachedWriteHandle = getModuleStructuralModelForWrite(this);
- if (cachedReadHandle == null)
- cachedReadHandle = getModuleStructuralModelForRead(this);
+ //if (cachedReadHandle == null)
+ // cachedReadHandle = getModuleStructuralModelForRead(this);
}
}
@@ -663,8 +656,8 @@
// System.out.println(buffer.toString());
this.emfContext = null;
if (cachedWriteHandle != null) {
- if (cachedWriteHandle.isDirty())
- cachedWriteHandle.saveIfNecessary(this);
+// if (cachedWriteHandle.isDirty())
+// cachedWriteHandle.saveIfNecessary(this);
cachedWriteHandle.dispose();
cachedWriteHandle = null;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetDataModelConfigAdapter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetDataModelConfigAdapter.java
index 431c7ee..cc8675d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetDataModelConfigAdapter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetDataModelConfigAdapter.java
@@ -62,6 +62,12 @@
{
return dm.validate();
}
+
+ public void dispose()
+ {
+ super.dispose();
+ dm.dispose();
+ }
public static final class Factory
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
index d8cb5d6..aecde37 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
@@ -24,9 +24,9 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
@@ -41,11 +41,11 @@
import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
@@ -80,10 +80,11 @@
return names;
}
+ private final IFacetedProjectWorkingCopy fpjwc = FacetedProjectFramework.createNewProject();
+
public void init() {
super.init();
- final IFacetedProjectWorkingCopy fpjwc = FacetedProjectFramework.createNewProject();
model.setProperty(FACETED_PROJECT_WORKING_COPY, fpjwc);
fpjwc.addListener
@@ -134,7 +135,10 @@
{
final String projectName = (String) event.getProperty();
getDataModel().setProperty(FACET_PROJECT_NAME, projectName);
- fpjwc.setProjectName( projectName );
+ IStatus status = getDataModel().validateProperty(FACET_PROJECT_NAME);
+ if( status.isOK() ){
+ fpjwc.setProjectName( projectName );
+ }
}
else if( prop.equals( IProjectCreationPropertiesNew.PROJECT_LOCATION ) )
{
@@ -146,6 +150,14 @@
model.addNestedModel(NESTED_PROJECT_DM, projectDataModel);
}
+ @Override
+ public void dispose() {
+ if(fpjwc != null){
+ fpjwc.dispose();
+ }
+ super.dispose();
+ }
+
protected class FacetActionMapImpl extends HashMap implements FacetActionMap {
private static final long serialVersionUID = 1L;
private boolean supressNotification = false;
@@ -320,7 +332,7 @@
facetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, newVersion);
}
} catch (CoreException e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
}
}
}
@@ -344,10 +356,17 @@
if( ! ( config instanceof IDataModel ) )
{
- config = Platform.getAdapterManager().getAdapter( config, IDataModel.class );
+ config = Platform.getAdapterManager().loadAdapter( config, IDataModel.class.getName() );
}
- facetDmMap.add( (IDataModel) config );
+ final IDataModel dm = (IDataModel) config;
+
+ facetDmMap.put( facet.getId(), dm );
+
+ for( String alias : facet.getAliases() )
+ {
+ facetDmMap.put( alias, dm );
+ }
}
}
return super.propertySet(propertyName, propertyValue);
@@ -420,7 +439,7 @@
descriptors[i] = new DataModelPropertyDescriptor(runtime, runtime.getLocalizedName());
}
if(descriptors.length > 2){
- Arrays.sort(descriptors, 0, descriptors.length - 2, new Comparator() {
+ Arrays.sort(descriptors, 0, descriptors.length - 1, new Comparator() {
public int compare(Object arg0, Object arg1) {
DataModelPropertyDescriptor d1 = (DataModelPropertyDescriptor)arg0;
DataModelPropertyDescriptor d2 = (DataModelPropertyDescriptor)arg1;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/ProjectMigratorDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/ProjectMigratorDataModelProvider.java
index 21c3ca3..07adcaf 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/ProjectMigratorDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/ProjectMigratorDataModelProvider.java
@@ -17,6 +17,12 @@
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public class ProjectMigratorDataModelProvider extends AbstractDataModelProvider implements IProjectMigratorDataModelProperties {
public Set getPropertyNames() {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java
new file mode 100644
index 0000000..2367892
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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.datamodel.properties;
+
+
+/**
+ * This is an alternative to ICreateReferenceComponentsDataModelProperties
+ * It is meant to be a simpler type of operation where you can pass in
+ * an already-formed IVirtualReference rather than the individual properties
+ * to be set.
+ */
+public interface IAddReferenceDataModelProperties {
+
+ /**
+ * <p>
+ * This required property is the {@link org.eclipse.wst.common.componentcore.resources.IVirtualComponent} which will reference the
+ * {@link org.eclipse.wst.common.componentcore.resources.IVirtualComponent}s specified by {@link #TARGET_COMPONENT_LIST}.
+ * </p>
+ * <p>
+ * For example, if {@link org.eclipse.wst.common.componentcore.resources.IVirtualComponent}s A, B, and C exist and references are required
+ * from A to B and A to C, then {@link #SOURCE_COMPONENT} should be set to A, and
+ * {@link #TARGET_COMPONENT_LIST} should be set to a {@link java.util.List} containing B and C.
+ * </p>
+ */
+ public static final String SOURCE_COMPONENT = "IAddReferenceDataModelProperties.SOURCE_COMPONENT"; //$NON-NLS-1$
+
+ /**
+ * <p>
+ * This required property is the {@link java.util.List} containing the {@link org.eclipse.wst.common.componentcore.resources.IVirtualReference}s that
+ * will be referenced from the {@link org.eclipse.wst.common.componentcore.resources.IVirtualComponent} specified by {@link #SOURCE_COMPONENT}.
+ * It may also be a single {@link org.eclipse.wst.common.componentcore.resources.IVirtualReference} if desired
+ * </p>
+ */
+ public static final String TARGET_REFERENCE_LIST = "IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST"; //$NON-NLS-1$
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IComponentCreationDataModelProperties.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IComponentCreationDataModelProperties.java
deleted file mode 100644
index c8dcf56..0000000
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IComponentCreationDataModelProperties provides properties to the DataModel associated with the
- * ComponentCreationDataModelProvider as well as all extending interfaces extending
- * IComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- *
- * @see org.eclipse.wst.common.componentcore.internal.operation.ComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated
- *
- * @see IConnectorFacetInstallDataModelProperties
- */
-public interface IComponentCreationDataModelProperties extends IDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
- /**
- * Required, type String. The user defined name of the target project for the component to be
- * created.
- */
- public static final String PROJECT_NAME = "IComponentCreationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String. The user defined name of the component to be created.
- */
- public static final String COMPONENT_NAME = "IComponentCreationDataModelProperties.COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String. The user defined location on disk of the target project for the
- * component to be created. Defaulted to default eclipse workspace location
- */
- public static final String LOCATION = "IFlexibleProjectCreationDataModelProperties.LOCATION"; //$NON-NLS-1$
-
-
- /**
- * Required, type String. The user defined deploy name of the component to be created. The
- * DataModelProvider will default the name to the COMPONENT_NAME.
- */
- public static final String COMPONENT_DEPLOY_NAME = "IComponentCreationDataModelProperties.COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
- /**
- * Required, type String. Nested operation to create a new project.
- */
- public static final String NESTED_PROJECT_CREATION_DM = "IComponentCreationDataModelProperties.NESTED_PROJECT_CREATION_DM"; //$NON-NLS-1$
- // TODO delete this
- /**
- * Optional, type Boolean The default value is <code>Boolean.TRUE</code>. If this property is
- * set to <code>Boolean.TRUE</code> then a default deployment descriptor and supporting
- * bindings files will be generated.
- */
- public static final String CREATE_DEFAULT_FILES = "IComponentCreationDataModelProperties.CREATE_DEFAULT_FILES"; //$NON-NLS-1$
-
- /**
- * An unsettable result property used to retreive the created virtual component after the
- * operation has executed.
- */
- public static final String COMPONENT = "IComponentCreationDataModelProperties.COMPONENT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IProjectMigratorDataModelProperties.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IProjectMigratorDataModelProperties.java
index 1e93fff..012b49d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IProjectMigratorDataModelProperties.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IProjectMigratorDataModelProperties.java
@@ -12,6 +12,12 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public interface IProjectMigratorDataModelProperties extends IDataModelProperties {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
index 9e38950..9d1fafd 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.common.componentcore.internal;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IProject;
@@ -21,7 +22,6 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
@@ -35,6 +35,7 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectListener;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
/**
*
@@ -149,12 +150,10 @@
facetProj = ProjectFacetsManager.create(project);
if (facetProj != null)
facetProj.addListener(this);
- } catch (UnresolveableURIException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (UnresolveableURIException e){
+ ModulecorePlugin.logError(e);
} catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}finally {
componentProject = aProject;
}
@@ -274,7 +273,8 @@
* @throws UnresolveableURIException
* could not WorkbenchResource with the corresponding URI.
*/
- protected boolean processResourcesIfInterrested(List theResources) {
+ protected boolean processResourcesIfInterrested(List aTheResources) {
+ List theResources = new ArrayList(aTheResources);
int size = theResources.size();
Resource resourceToProcess;
boolean processed = false;
@@ -325,8 +325,7 @@
try {
EnablementManager.INSTANCE.notifyFunctionGroupChanged(null,getComponentProject());
} catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
}
@@ -338,7 +337,7 @@
if (facetProj != null)
facetProj.removeListener(this);
} catch (Exception e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
}
super.doDispose();
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
index eed4fe3..e789e75 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ComponentcorePackage.java,v 1.8 2006/04/27 04:17:40 cbridgha Exp $
+ * $Id: ComponentcorePackage.java,v 1.9 2009/06/09 20:02:04 jsholl Exp $
*/
package org.eclipse.wst.common.componentcore.internal;
@@ -44,7 +44,7 @@
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "componentcore.xmi";
+ String eNS_URI = "componentcore.xmi"; //$NON-NLS-1$
/**
* The package namespace name.
@@ -52,7 +52,7 @@
* <!-- end-user-doc -->
* @generated
*/
- String eNS_PREFIX = "org.eclipse.wst.common.componentcore";
+ String eNS_PREFIX = "org.eclipse.wst.common.componentcore"; //$NON-NLS-1$
/**
* The singleton instance of the package.
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/DefaultModuleHandler.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/DefaultModuleHandler.java
new file mode 100644
index 0000000..b49b040
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/DefaultModuleHandler.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+
+public class DefaultModuleHandler implements IModuleHandler {
+
+ public String getArchiveName(IProject proj,IVirtualComponent comp) {
+ if (comp != null)
+ return comp.getName() + ".jar";
+ return proj.getName() + ".jar";
+ }
+
+ public List<IProject> getFilteredProjectListForAdd(IVirtualComponent sourceComponent, List<IProject> availableProjects) {
+ Iterator<IProject> i = availableProjects.iterator();
+ IProject p;
+ while(i.hasNext()) {
+ p = i.next();
+ if( !p.isOpen())
+ i.remove();
+ else if( p.equals(sourceComponent.getProject()))
+ i.remove();
+ }
+ return availableProjects;
+ }
+
+ public boolean setComponentAttributes(IProject proj) {
+
+ return true;
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IComponentProjectMigrator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IComponentProjectMigrator.java
index 0f66ad1..64c3b93 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IComponentProjectMigrator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IComponentProjectMigrator.java
@@ -12,6 +12,12 @@
import org.eclipse.core.resources.IProject;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public interface IComponentProjectMigrator {
public void migrateProject(IProject project);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IModuleHandler.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IModuleHandler.java
new file mode 100644
index 0000000..a40393f
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/IModuleHandler.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+package org.eclipse.wst.common.componentcore.internal;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+
+/**
+ * Interface intended to reflect behavior of customized components
+ *
+ */
+public interface IModuleHandler {
+
+
+ /**
+ * This is used to return a proper archive name based on the component type
+ * @param proj
+ * @param comp
+ * @return String archive name
+ */
+ public String getArchiveName(IProject proj, IVirtualComponent comp);
+
+ /**
+ * Used to filter items displayed in Add dialog
+ * @param sourceComponent
+ * @param availableComponents
+ * @return List of items that will not be shown in the add ref dialogs
+ */
+ public List<IProject> getFilteredProjectListForAdd(IVirtualComponent sourceComponent, List<IProject> availableComponents);
+
+ /**
+ * This call is meant to add IVirtualCompoonent infrastructure to any project passed if needed
+ * Meant be overridden to include technology specific attributes
+ * @param proj
+ * @return boolean indicating operation success
+ */
+ public boolean setComponentAttributes(IProject proj);
+
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
index 0372d3c..e1fd00b 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
@@ -31,6 +31,12 @@
import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public class ModuleCoreValidator implements IValidatorJob {
protected IReporter _reporter;
@@ -49,6 +55,8 @@
if (structureEdit != null) {
ModuleStructuralModel structuralModel = structureEdit.getModuleStructuralModel();
if (structuralModel != null) {
+ // First touch the model File to make sure is synched before getting the lock
+ structuralModel.getComponentFile();
// acquiring the ModuleStructuralModel lock here first because the call to getPrimaryResource()
// will cause this lock to be acquired later resulting in a potential deadlock
ILock lock = EMFWorkbenchEditContextFactory.getProjectLockObject(structuralModel.getProject());
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidatorHelper.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidatorHelper.java
index 1969f61..ad2c320 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidatorHelper.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidatorHelper.java
@@ -14,6 +14,12 @@
import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public class ModuleCoreValidatorHelper extends WorkbenchContext {
public static final String MODULECORE = "MODULECORE";
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleMigratorManager.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleMigratorManager.java
index 88a9078..caf21e0 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleMigratorManager.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleMigratorManager.java
@@ -33,6 +33,12 @@
import org.eclipse.wst.common.frameworks.internal.datamodel.IWorkspaceRunnableWithStatus;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public class ModuleMigratorManager {
private static HashMap managerCache = new HashMap();
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
index 2bdacb1..c120a83 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.common.componentcore.internal;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -18,6 +19,7 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
@@ -25,7 +27,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
@@ -83,6 +84,7 @@
public static final String MODULE_CORE_ID = "moduleCoreId"; //$NON-NLS-1$
private static final String PROJECT_VERSION_1_5 = "1.5.0";
private boolean useOldFormat = false;
+ private Boolean needsSync = new Boolean(true);
public ModuleStructuralModel(String editModelID, EMFWorkbenchContext context, boolean readOnly) {
super(editModelID, context, readOnly);
}
@@ -118,8 +120,7 @@
if (res == null)
return null;
} catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
EObject modelRoot = null;
modelRoot = super.getPrimaryRootObject();
@@ -236,10 +237,6 @@
}
public Resource prepareProjectModulesIfNecessary() throws CoreException {
XMIResource res;
- if (!isComponentSynchronizedOrNull()) {
- //Return if component file is out of sync from workspace
- return null;
- }
res = (XMIResource) getPrimaryResource();
if (res != null && resNeedsMigrating(res) && !useOldFormat)
return null;
@@ -253,51 +250,64 @@
return res;
}
- /**
- * This methods checks the status of the component file, and first checks for existance, then if its locally synchronized
- * @return boolean
- */
- private boolean isComponentSynchronizedOrNull() {
- IFile componentFile = getProject().getFile(StructureEdit.MODULE_META_FILE_NAME);
- IPath componentFileLocation = componentFile.getLocation();
- if (componentFileLocation != null && !componentFileLocation.toFile().exists()) {
- componentFile = getProject().getFile(R1_MODULE_META_FILE_NAME);
- componentFileLocation = componentFile.getLocation();
- if (componentFileLocation != null && !componentFileLocation.toFile().exists()) {
- componentFile = getProject().getFile(R0_7_MODULE_META_FILE_NAME);
- componentFileLocation = componentFile.getLocation();
- if (componentFileLocation != null && !componentFileLocation.toFile().exists())
- return true;
- }
- }
- if (componentFileLocation == null)
- return true;
- else return componentFile.isSynchronized(IResource.DEPTH_ZERO);
- }
public IFile getComponentFile() {
+
IFile compFile = getProject().getFile(StructureEdit.MODULE_META_FILE_NAME);
- if (compFile.isAccessible())
+ if (compFile.isAccessible()) {
+ checkSync(compFile);
return compFile;
+ }
else { //Need to check for legacy file locations also....
compFile = getProject().getFile(ModuleStructuralModel.R1_MODULE_META_FILE_NAME);
- if (compFile.isAccessible())
+ if (compFile.isAccessible()) {
+ checkSync(compFile);
return compFile;
+ }
else {
compFile = getProject().getFile(ModuleStructuralModel.R0_7_MODULE_META_FILE_NAME);
- if (compFile.isAccessible())
+ if (compFile.isAccessible()) {
+ checkSync(compFile);
return compFile;
+ }
}
}
return getProject().getFile(StructureEdit.MODULE_META_FILE_NAME);
}
+ private void checkSync(IFile compFile) {
+ boolean localNeedsSync = false;
+ synchronized (needsSync) {
+ localNeedsSync = needsSync;
+ }
+ if (localNeedsSync) { // Only check sync once for life of this model
+ if (!compFile.isSynchronized(IResource.DEPTH_ONE)) {
+ File iofile = compFile.getFullPath().toFile();
+ if (iofile.exists() || compFile.exists()) {
+ try {
+ Workspace workspace = (Workspace)compFile.getWorkspace();
+ if (workspace.getElementTree().isImmutable())
+ {
+ workspace.newWorkingTree();
+ }
+ ((org.eclipse.core.internal.resources.Resource)compFile).getLocalManager().refresh(compFile.getProject(), IResource.DEPTH_INFINITE, true, null);
+ } catch (CoreException ce) {
+ // ignore
+ }
+ }
+ }
+ synchronized (needsSync) {
+ needsSync = new Boolean(false);
+ }
+ }
+ }
+
public WTPModulesResource makeWTPModulesResource() {
return (WTPModulesResource) createResource(WTPModulesResourceFactory.WTP_MODULES_URI_OBJ);
}
protected void runSaveOperation(IWorkspaceRunnable runnable, IProgressMonitor monitor) throws SaveFailedException {
try {
- ResourcesPlugin.getWorkspace().run(runnable, null,IWorkspace.AVOID_UPDATE,monitor);
+ ResourcesPlugin.getWorkspace().run(runnable, getComponentFile(),IWorkspace.AVOID_UPDATE,monitor);
} catch (CoreException e) {
throw new SaveFailedException(e);
}
@@ -315,25 +325,14 @@
* @return
*/
public Resource getPrimaryResource() {
- // Overriden to handle loading the .component resource in new and old forms
- // First will try to load from .settings/org.eclipse.wst.common.component
- // Second will try to load from the old location(s) .settings/.component or .component
+ // Will always go through the getFile method that searches for all possible locations.
+ IFile compFile = getComponentFile();
- URI uri = URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
+ URI uri = URI.createURI(compFile.getProjectRelativePath().toPortableString());
WTPModulesResource res = (WTPModulesResource)getResource(uri);
- if (res == null || !res.isLoaded()) {
+ if (res == null || !res.isLoaded() || res.getContents().isEmpty()) {
removeResource(res);
- uri = URI.createURI(R1_MODULE_META_FILE_NAME);
- res = (WTPModulesResource)getResource(uri);
- if (res == null || !res.isLoaded()) {
- removeResource(res);
- uri = URI.createURI(R0_7_MODULE_META_FILE_NAME);
- res = (WTPModulesResource)getResource(uri);
- if (res == null || !res.isLoaded()) {
- removeResource(res);
- res = null;
- }
- }
+ res = null;
}
return res;
}
@@ -394,33 +393,21 @@
}
@Override
public void access(Object accessorKey) {
-
- super.access(accessorKey);
-// StringBuffer buffer = new StringBuffer("Access Module model (");
-// buffer.append(this.hashCode());
-// buffer.append(") Project: ");
-// buffer.append(this.getProject());
-// if (isReadOnly())
-// buffer.append(" R = "); //$NON-NLS-1$
-// else
-// buffer.append(" W = "); //$NON-NLS-1$
-// buffer.append(getRegistry().size());
-// System.out.println(buffer.toString());
+ //Not bothering with ref counting model access - always allow save/access
}
@Override
public void releaseAccess(Object accessorKey) {
- super.releaseAccess(accessorKey);
-// StringBuffer buffer = new StringBuffer("Release Module model (");
-// buffer.append(this.hashCode());
-// buffer.append(") Project: ");
-// buffer.append(this.getProject());
-// if (isReadOnly())
-// buffer.append(" R = "); //$NON-NLS-1$
-// else
-// buffer.append(" W = "); //$NON-NLS-1$
-// buffer.append(getRegistry().size());
-// System.out.println(buffer.toString());
+ //Not bothering with ref counting model access - always allow save/access
+ }
+ @Override
+ protected void assertPermissionToSave(Object accessorKey) {
+ //Not bothering with ref counting model access - always allow save/access
+ }
+ @Override
+ public boolean isShared() {
+ //Not bothering with ref counting model access - always allow save/access
+ return false;
}
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ProjectMigratorRegistry.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ProjectMigratorRegistry.java
index f6883ca..0848454 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ProjectMigratorRegistry.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ProjectMigratorRegistry.java
@@ -24,8 +24,10 @@
import org.eclipse.jem.util.RegistryReader;
/**
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
*/
public class ProjectMigratorRegistry extends RegistryReader {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
index 9b04b00..4bcf5a8 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
@@ -11,7 +11,6 @@
package org.eclipse.wst.common.componentcore.internal;
-import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -22,6 +21,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -29,19 +29,19 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.jobs.ILock;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jem.util.UIContextDetermination;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.IEditModelHandler;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeNode;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
import org.eclipse.wst.common.componentcore.internal.util.EclipseResourceAdapter;
+import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
+import org.eclipse.wst.common.componentcore.resolvers.ReferenceResolverUtil;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
@@ -58,7 +58,7 @@
* {@see org.eclipse.wst.common.modulecore.ModuleStructuralModel}) correctly. Each project has
* exactly one ({@see org.eclipse.wst.common.modulecore.ModuleStructuralModel}) for read and
* exactly one for write. Each of these is shared among all clients and reference counted as
- * necessary. Clients should use ModuleCore when working with the WTP Modules Strcutrual Model.
+ * necessary. Clients should use ModuleCore when working with the WTP Modules Structural Model.
* </p>
*
* <p>
@@ -248,6 +248,7 @@
if (eclipseResourceAdapter != null)
return eclipseResourceAdapter.getEclipseResource();
eclipseResourceAdapter = new EclipseResourceAdapter();
+ eclipseResourceAdapter.setTarget(aModuleResource);
aModuleResource.eAdapters().add(eclipseResourceAdapter);
return eclipseResourceAdapter.getEclipseResource();
}
@@ -283,45 +284,14 @@
return componentType;
}
- public static IVirtualReference createVirtualReference(IVirtualComponent context, ReferencedComponent referencedComponent) {
-
- IVirtualComponent targetComponent = null;
- IProject targetProject = null;
- URI uri = referencedComponent.getHandle();
- if (uri == null)
- return null;
- boolean isClassPathURI = ModuleURIUtil.isClassPathURI(uri);
- if( !isClassPathURI ){
- try {
- targetProject = StructureEdit.getContainingProject(uri);
- } catch(UnresolveableURIException uurie) {
- //Ignore
- }
- // if the project cannot be resolved, assume it's local - really it probably deleted
-
- targetComponent = ComponentCore.createComponent(targetProject);
-
-
- }else{
- String archiveType = ""; //$NON-NLS-1$
- String archiveName = ""; //$NON-NLS-1$
- try {
- archiveType = ModuleURIUtil.getArchiveType(uri);
- archiveName = ModuleURIUtil.getArchiveName(uri);
-
- } catch (UnresolveableURIException e) {
- //Ignore
- }
- targetComponent = ComponentCore.createArchiveComponent(context.getProject(), archiveType + IPath.SEPARATOR + archiveName );
- }
- return new VirtualReference(context, targetComponent, referencedComponent.getRuntimePath(), referencedComponent.getDependencyType().getValue());
+ public static IVirtualReference createVirtualReference(IVirtualComponent context, ReferencedComponent reference) {
+ IReferenceResolver resolver = ReferenceResolverUtil.getDefault().getResolver(context, reference);
+ return resolver.resolve(context, reference);
}
protected StructureEdit(ModuleCoreNature aNature, boolean toAccessAsReadOnly) {
- if (toAccessAsReadOnly)
- structuralModel = aNature.getModuleStructuralModelForRead(this);
- else
- structuralModel = aNature.getModuleStructuralModelForWrite(this);
+ // always get the write editmodel - one instance only
+ structuralModel = aNature.getModuleStructuralModelForWrite(this);
aProject = aNature.getProject();
isReadOnly = toAccessAsReadOnly;
isStructuralModelSelfManaged = true;
@@ -358,10 +328,18 @@
if (isReadOnly)
throwAttemptedReadOnlyModification();
else if (validateEdit().isOK()) {
+ // Make sure we obtain workspace rule before saving
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ try {
+ //OK wait to get workspace root before refreshing
+ Job.getJobManager().beginRule(root, null);
synchronized (structuralModel) {
if (!structuralModel.isDisposed())
structuralModel.save(aMonitor, this);
}
+ } finally {
+ Job.getJobManager().endRule(root);
+ }
}
}
@@ -379,7 +357,7 @@
public void saveIfNecessary(IProgressMonitor aMonitor) {
if (isReadOnly)
throwAttemptedReadOnlyModification();
- else if (validateEdit().isOK()) {
+ else if (structuralModel.isDirty() && validateEdit().isOK()) {
if (!structuralModel.isDisposed())
structuralModel.saveIfNecessary(aMonitor, this);
}
@@ -424,8 +402,7 @@
try {
structuralModel.prepareProjectModulesIfNecessary();
} catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
}
}
@@ -447,15 +424,7 @@
*/
public ProjectComponents getComponentModelRoot() {
IFile file = structuralModel.getComponentFile();
- if (!file.isSynchronized(IResource.DEPTH_ONE)) {
- try {
- File iofile = file.getFullPath().toFile();
- if (iofile.exists() || file.exists())
- file.refreshLocal(IResource.DEPTH_ONE, null);
- } catch (CoreException ce) {
- //ignore
- }
- }
+ if (file == null) return null;
ProjectComponents comps = null;
ILock lock = EMFWorkbenchEditContextFactory.getProjectLockObject(structuralModel.getProject());
try{
@@ -471,8 +440,7 @@
lock.release();
}
}
-
- return comps;
+ return comps;
}
/**
@@ -950,9 +918,8 @@
}
public static URI createComponentURI(IProject aContainingProject, String aComponentName) {
- return URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + IPath.SEPARATOR + PlatformURLModuleConnection.RESOURCE_MODULE + aContainingProject.getName() + IPath.SEPARATOR + aComponentName);
+ return ModuleURIUtil.fullyQualifyURI(aContainingProject, aComponentName);
}
-
protected IProject getProject() {
return aProject;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraph.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraph.java
index 74341f2..f31970a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraph.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraph.java
@@ -28,7 +28,7 @@
public IProject[] getReferencingComponents(IProject target) {
Set<IProject> referencingComponents = IDependencyGraph.INSTANCE.getReferencingComponents(target);
- return (IProject[]) referencingComponents.toArray(new IProject[referencingComponents.size()]);
+ return referencingComponents.toArray(new IProject[referencingComponents.size()]);
}
public void addReference(IProject target, IProject referencingComponent) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphEvent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphEvent.java
new file mode 100644
index 0000000..f63c4d6
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphEvent.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * 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.internal.builder;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+
+public class DependencyGraphEvent implements IDependencyGraphUpdateEvent {
+
+ private int type = 0;
+ private long modStamp = 0;
+
+ /**
+ * Both these maps are reverse reference maps as the ones are in
+ * {@link IDependencyGraph}
+ */
+ private Map<IProject, Set<IProject>> addedReferences = null;
+ private Map<IProject, Set<IProject>> removedReferences = null;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.eclipse.wst.common.componentcore.internal.builder.
+ * IDependencyGraphUpdateEvent#getType()
+ */
+ public int getType() {
+ return type;
+ }
+
+ private void setType(int newType){
+ this.type = newType;
+ }
+
+ void setModStamp(long modStamp) {
+ this.modStamp = modStamp;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.eclipse.wst.common.componentcore.internal.builder.
+ * IDependencyGraphUpdateEvent#getModStamp()
+ */
+ public long getModStamp() {
+ return modStamp;
+ }
+
+ void addRefererence(IProject sourceProject, IProject targetProject) {
+ if (sourceProject == null) {
+ throw new NullPointerException("Source project must not be null.");
+ }
+ if (targetProject == null) {
+ throw new NullPointerException("Target project must not be null.");
+ }
+ //update removed references accordingly
+ if(removedReferences != null){
+ Set references = removedReferences.get(targetProject);
+ if(references != null){
+ if(references.remove(sourceProject)) {
+ if(references.isEmpty()){
+ removedReferences.remove(targetProject);
+ if(removedReferences.isEmpty()){
+ removedReferences = null;
+ if((getType() & ADDED) == ADDED){
+ setType(ADDED);
+ } else {
+ setType(0);
+ }
+ }
+ }
+ //there is no net change, so return.
+ return;
+ }
+ }
+ }
+
+ if (addedReferences == null) {
+ setType(getType() | ADDED);
+ addedReferences = new HashMap<IProject, Set<IProject>>();
+ }
+ Set references = addedReferences.get(targetProject);
+ if (references == null) {
+ references = new HashSet<IProject>();
+ addedReferences.put(targetProject, references);
+ }
+ references.add(sourceProject);
+
+
+ }
+
+ void removeReference(IProject sourceProject, IProject targetProject) {
+ if (sourceProject == null) {
+ throw new NullPointerException("Source project must not be null.");
+ }
+ if (targetProject == null) {
+ throw new NullPointerException("Target project must not be null.");
+ }
+
+ //updated added references accordingly
+ if(addedReferences != null){
+ Set references = addedReferences.get(targetProject);
+ if(references != null){
+ if(references.remove(sourceProject)){
+ if(references.isEmpty()){
+ addedReferences.remove(targetProject);
+ if(addedReferences.isEmpty()){
+ addedReferences = null;
+ if((getType() & REMOVED) == REMOVED){
+ setType(REMOVED);
+ } else {
+ setType(0);
+ }
+ }
+ }
+ //there is no net change, so return.
+ return;
+ }
+ }
+ }
+
+ if (removedReferences == null) {
+ setType(getType() | REMOVED);
+ removedReferences = new HashMap<IProject, Set<IProject>>();
+ }
+ Set references = removedReferences.get(targetProject);
+ if (references == null) {
+ references = new HashSet<IProject>();
+ removedReferences.put(targetProject, references);
+ }
+ references.add(sourceProject);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.eclipse.wst.common.componentcore.internal.builder.
+ * IDependencyGraphUpdateEvent#getAddedReferences()
+ */
+ public Map<IProject, Set<IProject>> getAddedReferences() {
+ if (addedReferences == null) {
+ return Collections.EMPTY_MAP;
+ }
+ return addedReferences;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.eclipse.wst.common.componentcore.internal.builder.
+ * IDependencyGraphUpdateEvent#getRemovedReferences()
+ */
+ public Map<IProject, Set<IProject>> getRemovedReferences() {
+ if (removedReferences == null) {
+ return Collections.EMPTY_MAP;
+ }
+ return removedReferences;
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buff = new StringBuffer("Dependency Graph Event \n{\n getModStamp() = "+getModStamp()+"\n hashCode() = "+hashCode()+"\n");
+ boolean added = (getType() & ADDED) == ADDED;
+ if(added){
+ buff.append(" ADDED:\n" );
+ for(Iterator<Map.Entry<IProject, Set<IProject>>> iterator = getAddedReferences().entrySet().iterator(); iterator.hasNext();){
+ Map.Entry<IProject, Set<IProject>> entry = iterator.next();
+ buff.append(" " + entry.getKey().getName() + " -> {");
+ for (Iterator<IProject> mappedProjects = entry.getValue().iterator(); mappedProjects.hasNext();) {
+ buff.append(mappedProjects.next().getName());
+ if (mappedProjects.hasNext()) {
+ buff.append(", ");
+ }
+ }
+ buff.append("}\n");
+ }
+ }
+ boolean removed = (getType() & REMOVED) == REMOVED;
+ if(removed){
+ buff.append(" REMOVED:\n" );
+ for(Iterator<Map.Entry<IProject, Set<IProject>>> iterator = getRemovedReferences().entrySet().iterator(); iterator.hasNext();){
+ Map.Entry<IProject, Set<IProject>> entry = iterator.next();
+ buff.append(" " + entry.getKey().getName() + " -> {");
+ for (Iterator<IProject> mappedProjects = entry.getValue().iterator(); mappedProjects.hasNext();) {
+ buff.append(mappedProjects.next().getName());
+ if (mappedProjects.hasNext()) {
+ buff.append(", ");
+ }
+ }
+ buff.append("}\n");
+ }
+ }
+ buff.append("}\n");
+ return buff.toString();
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
index 678b9bd..3c960a2 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
@@ -5,6 +5,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.core.resources.IProject;
@@ -19,15 +20,21 @@
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.jobs.ILock;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResourceFactory;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.osgi.framework.Bundle;
public class DependencyGraphImpl implements IDependencyGraph {
@@ -37,15 +44,14 @@
private Object graphLock = new Object();
/**
- * If projects and and B both depend on C an entry in this graph would be {C ->
+ * If projects A and and B both depend on C an entry in this graph would be {C ->
* {A, B} }
*/
private Map<IProject, Set<IProject>> graph = null;
private long modStamp = 0;
-
- private Map<String, Object> referenceOptions = new HashMap<String, Object>();
+ private ListenerList listeners = new ListenerList();
/**
* This is not public; only {@link IDependencyGraph#INSTANCE} should be
@@ -71,7 +77,17 @@
return modStamp;
}
}
-
+
+ private void incrementModStamp(){
+ synchronized (graphLock) {
+ modStamp++;
+ }
+ }
+ /**
+ * Returns the set of projects whose components reference the specified
+ * target project's component. For example if projects A and B both
+ * reference C. Passing C as the targetProject will return {A, B}
+ */
public Set<IProject> getReferencingComponents(IProject targetProject) {
waitForAllUpdates(null);
synchronized (graphLock) {
@@ -79,12 +95,22 @@
if (set == null) {
return Collections.EMPTY_SET;
} else {
+ DependencyGraphEvent event = null;
for (Iterator<IProject> iterator = set.iterator(); iterator.hasNext();) {
- IProject project = iterator.next();
- if (!project.isAccessible()) {
+ IProject sourceProject = iterator.next();
+ if (!sourceProject.isAccessible()) {
iterator.remove();
+ if(event == null){
+ incrementModStamp();
+ event = new DependencyGraphEvent();
+ event.setModStamp(getModStamp());
+ }
+ event.removeReference(sourceProject, targetProject);
}
}
+ if(event != null){
+ notifiyListeners(event);
+ }
Set<IProject> copy = new HashSet<IProject>();
copy.addAll(set);
return copy;
@@ -113,19 +139,19 @@
case IResource.PROJECT: {
int kind = delta.getKind();
if ((IResourceDelta.ADDED & kind) != 0) {
- queueProjectAdded((IProject) resource);
+ update((IProject) resource, IDependencyGraph.ADDED);
return false;
} else if ((IResourceDelta.REMOVED & kind) != 0) {
- queueProjectDeleted((IProject) resource);
+ update((IProject) resource, IDependencyGraph.REMOVED);
return false;
} else if ((IResourceDelta.CHANGED & kind) != 0) {
int flags = delta.getFlags();
if ((IResourceDelta.OPEN & flags) != 0) {
boolean isOpen = ((IProject) resource).isOpen();
if (isOpen) {
- queueProjectAdded((IProject) resource);
+ update((IProject) resource, IDependencyGraph.ADDED);
} else {
- queueProjectDeleted((IProject) resource);
+ update((IProject) resource, IDependencyGraph.REMOVED);
}
return false;
}
@@ -134,14 +160,20 @@
return false;
}
case IResource.FOLDER:
- if (resource.getName().equals(".settings")) {
+ if (resource.getName().equals(IModuleConstants.DOT_SETTINGS)) {
return true;
}
return false;
case IResource.FILE:
String name = resource.getName();
if (name.equals(WTPModulesResourceFactory.WTP_MODULES_SHORT_NAME)) {
- update(resource.getProject());
+ if((delta.getKind() & IResourceDelta.ADDED) != 0){
+ update(resource.getProject(), IDependencyGraph.ADDED);
+ } else {
+ update(resource.getProject(), IDependencyGraph.MODIFIED);
+ }
+ } else if(name.equals(".project")){
+ update(resource.getProject(), IDependencyGraph.ADDED);
}
default:
return false;
@@ -157,7 +189,6 @@
*/
private void initGraph() {
synchronized (graphLock) {
- referenceOptions.put("GET_JAVA_REFS", Boolean.FALSE);
try {
preUpdate();
graph = new HashMap<IProject, Set<IProject>>();
@@ -176,7 +207,7 @@
preUpdate();
IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for (IProject sourceProject : allProjects) {
- queueProjectAdded(sourceProject);
+ update(sourceProject, IDependencyGraph.ADDED);
}
} finally{
postUpdate();
@@ -184,36 +215,67 @@
}
}
-
- private void removeAllReferences(IProject project) {
+
+ private void removeAllReferences(DependencyGraphEvent event){
synchronized (graphLock) {
- graph.remove(project);
- for (Iterator<Set<IProject>> iterator = graph.values().iterator(); iterator.hasNext();) {
- iterator.next().remove(project);
+ IProject [] allReferenceKeys = new IProject [graph.keySet().size()];
+ graph.keySet().toArray(allReferenceKeys);
+ for(IProject project : allReferenceKeys){
+ removeAllReferences(project, event);
}
- modStamp++;
}
}
- private void removeReference(IProject sourceProject, IProject targetProject) {
+ private void removeAllReferences(IProject targetProject, DependencyGraphEvent event) {
+ synchronized (graphLock) {
+ boolean removed = false;
+ Set<IProject> removedSet = graph.remove(targetProject);
+ if(removedSet != null && !removedSet.isEmpty()){
+ removed = true;
+ for(Iterator<IProject>iterator = removedSet.iterator(); iterator.hasNext();){
+ event.removeReference(iterator.next(), targetProject);
+ }
+ }
+ for(Iterator <Entry<IProject,Set<IProject>>>iterator = graph.entrySet().iterator(); iterator.hasNext();){
+ Entry<IProject,Set<IProject>> entry = iterator.next();
+ if(!entry.getValue().isEmpty() && entry.getValue().remove(targetProject)){
+ removed = true;
+ event.removeReference(targetProject, entry.getKey());
+ }
+ }
+ if(removed){
+ incrementModStamp();
+ event.setModStamp(getModStamp());
+ }
+ }
+ }
+
+ private void removeReference(IProject sourceProject, IProject targetProject, DependencyGraphEvent event) {
synchronized (graphLock) {
Set<IProject> referencingProjects = graph.get(targetProject);
if (referencingProjects != null) {
- referencingProjects.remove(sourceProject);
+ if(referencingProjects.remove(sourceProject)){
+ event.removeReference(sourceProject, targetProject);
+ incrementModStamp();
+ event.setModStamp(getModStamp());
+ }
}
- modStamp++;
}
}
- private void addReference(IProject sourceProject, IProject targetProject) {
+ private void addReference(IProject sourceProject, IProject targetProject, DependencyGraphEvent event) {
synchronized (graphLock) {
Set<IProject> referencingProjects = graph.get(targetProject);
if (referencingProjects == null) {
referencingProjects = new HashSet<IProject>();
graph.put(targetProject, referencingProjects);
}
- referencingProjects.add(sourceProject);
- modStamp++;
+ boolean added = referencingProjects.add(sourceProject);
+ if(added){
+ event.addRefererence(sourceProject, targetProject);
+ incrementModStamp();
+ event.setModStamp(getModStamp());
+ }
}
}
@@ -223,14 +285,20 @@
private final GraphUpdateJob graphUpdateJob = new GraphUpdateJob();
private final Object jobLock = new Object();
+
+ //This lock is used for deadlock avoidance. The specific scenario
+ //is during waitForAllUpdates(); if a deadlock is detected during
+ //the lock's acquire() method, this thread will temporarily release
+ //its already acquired ILocks to allow other threads to continue.
+ //When execution is returned to this thread, any release ILocks will
+ //be reacquired before proceeding
+ private final ILock jobILock = Job.getJobManager().newLock();
private class GraphUpdateJob extends Job {
public GraphUpdateJob() {
- super("Graph Update Job");
+ super(Resources.JOB_NAME);
setSystem(true);
- //[Bug 238685] need to lock on workspace to avoid dead lock
- setRule(ResourcesPlugin.getWorkspace().getRoot());
}
public boolean belongsTo(Object family) {
@@ -260,23 +328,17 @@
private Queue projectsUpdated = new Queue();
public void queueProjectAdded(IProject project) {
- synchronized (graphLock) {
- modStamp++;
- }
+ incrementModStamp();
projectsAdded.add(project);
}
public void queueProjectDeleted(IProject project) {
- synchronized (graphLock) {
- modStamp++;
- }
+ incrementModStamp();
projectsRemoved.add(project);
}
public void queueProjectUpdated(IProject project) {
- synchronized (graphLock) {
- modStamp++;
- }
+ incrementModStamp();
projectsUpdated.add(project);
}
@@ -285,116 +347,226 @@
boolean isEmpty = projectsAdded.isEmpty() && projectsRemoved.isEmpty() && projectsUpdated.isEmpty();
return !isEmpty;
}
-
+
+ private boolean running = false;
+ private void setRunning(boolean b) {
+ synchronized (runLock) {
+ running = b;
+ if(running){
+ runStamp++;
+ }
+ }
+ }
+
+ private boolean isRunning(){
+ synchronized (runLock) {
+ return running;
+ }
+ }
+
+ private boolean didRun(long stamp){
+ synchronized (runLock) {
+ return stamp != runStamp;
+ }
+ }
+
+ //keeps track of when each run
+ private long runStamp = 0;
+ private Object runLock = new Object();
+
+ public void waitForRun(long maxWaitTime) {
+ if(isRunning()){
+ return;
+ } else {
+ final long startTime = System.currentTimeMillis();
+ long localRunStamp = 0;
+ synchronized (graphLock) {
+ localRunStamp = runStamp;
+ }
+ while(true){
+ if(System.currentTimeMillis() - startTime > maxWaitTime){
+ return;
+ }
+ if(didRun(localRunStamp)){
+ return;
+ }
+ try {
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ Thread.interrupted();
+ }
+ }
+ }
+ }
+
protected IStatus run(IProgressMonitor monitor) {
- final Object[] removed = projectsRemoved.getListeners();
- final Object[] updated = projectsUpdated.getListeners();
- final Object[] added = projectsAdded.getListeners();
- if (removed.length == 0 && updated.length == 0 && added.length == 0) {
- return Status.OK_STATUS;
- }
- synchronized (graphLock) {
- modStamp++;
- }
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable e) {
- ModulecorePlugin.logError(e);
+ try{
+ jobILock.acquire();
+ setRunning(true);
+
+ if(ResourcesPlugin.getPlugin().getBundle().getState() == Bundle.STARTING ){
+ graphUpdateJob.schedule(JOB_DELAY);
+ return Status.OK_STATUS;
}
-
- public void run() throws Exception {
- // this is the simple case; just remove them all
- synchronized (graphLock) {
- for (Object o : removed) {
- IProject project = (IProject) o;
- removeAllReferences(project);
- }
+
+ final Object[] removed = projectsRemoved.getListeners();
+ final Object[] updated = projectsUpdated.getListeners();
+ final Object[] added = projectsAdded.getListeners();
+ if (removed.length == 0 && updated.length == 0 && added.length == 0) {
+ return Status.OK_STATUS;
+ }
+ incrementModStamp();
+ if(ResourcesPlugin.getPlugin().getBundle().getState() != Bundle.ACTIVE){
+ return Status.OK_STATUS;
+ }
+ SafeRunner.run(new ISafeRunnable() {
+ public void handleException(Throwable e) {
+ ModulecorePlugin.logError(e);
}
- // get the updated queue in case there are any adds
- // if there are any added projects, then unfortunately the
- // entire workspace needs to be processed
- if (added.length > 0) {
- IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (IProject sourceProject : allProjects) {
- IVirtualComponent component = ComponentCore.createComponent(sourceProject);
- if (component != null) {
- IVirtualReference[] references = null;
- if(referenceOptions != null && component instanceof VirtualComponent) {
- references = ((VirtualComponent)component).getReferences(referenceOptions);
- } else {
- references = component.getReferences();
- }
- for (IVirtualReference ref : references) {
- IVirtualComponent targetComponent = ref.getReferencedComponent();
- if (targetComponent != null) {
- IProject targetProject = targetComponent.getProject();
- if (targetProject != null && !targetProject.equals(sourceProject)) {
- addReference(sourceProject, targetProject);
- }
- }
+
+ public void run() throws Exception {
+ final DependencyGraphEvent event = new DependencyGraphEvent();
+
+ //all references will be rebuilt during an add
+ if(added.length == 0){
+ // this is the simple case; just remove them all
+ synchronized (graphLock) {
+ for (Object o : removed) {
+ IProject project = (IProject) o;
+ removeAllReferences(project, event);
}
}
}
- } else if (updated.length > 0) {
- IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- Set<IProject> validRefs = new HashSet<IProject>();
- for (Object o : updated) {
- IProject sourceProject = (IProject) o;
- IVirtualComponent component = ComponentCore.createComponent(sourceProject);
- if (component != null) {
- validRefs.clear();
- IVirtualReference[] references = null;
- if(referenceOptions != null && component instanceof VirtualComponent) {
- references = ((VirtualComponent)component).getReferences(referenceOptions);
- } else {
- references = component.getReferences();
- }
- for (IVirtualReference ref : references) {
- IVirtualComponent targetComponent = ref.getReferencedComponent();
- if (targetComponent != null) {
- IProject targetProject = targetComponent.getProject();
- if (targetProject != null && !targetProject.equals(sourceProject)) {
- validRefs.add(targetProject);
- }
- }
- }
- synchronized (graphLock) {
- for (IProject targetProject : allProjects) {
- // if the reference was identified
- // above, be sure to add it
- // otherwise, remove it
- if (validRefs.remove(targetProject)) {
- addReference(sourceProject, targetProject);
- } else {
- removeReference(sourceProject, targetProject);
- }
- }
- }
+ // get the updated queue in case there are any adds
+ // if there are any added projects, then unfortunately the
+ // entire workspace needs to be processed
+ if (added.length > 0) {
+ removeAllReferences(event);
+ IProject[] allProjects = null;
+ int state = ResourcesPlugin.getPlugin().getBundle().getState();
+ if (state == Bundle.ACTIVE) {
+ allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
} else {
- // if this project is not a component, then it
- // should be completely removed.
- removeAllReferences(sourceProject);
+ return;
+ }
+
+ for (IProject sourceProject : allProjects) {
+ IVirtualComponent component = ComponentCore.createComponent(sourceProject);
+ if (component != null && component instanceof VirtualComponent) {
+ ((VirtualComponent)component).flushCache();
+ }
+ }
+
+ for (IProject sourceProject : allProjects) {
+ IVirtualComponent component = ComponentCore.createComponent(sourceProject);
+ if (component != null && component instanceof VirtualComponent) {
+ IVirtualReference[] references = ((VirtualComponent)component).getRawReferences();
+ for (IVirtualReference ref : references) {
+ IVirtualComponent targetComponent = ref.getReferencedComponent();
+ if (targetComponent != null) {
+ IProject targetProject = targetComponent.getProject();
+ if (targetProject != null && !targetProject.equals(sourceProject)) {
+ addReference(sourceProject, targetProject, event);
+ }
+ }
+ }
+ }
+ }
+ } else if (updated.length > 0) {
+ IProject[] allProjects = null;
+ int state = ResourcesPlugin.getPlugin().getBundle().getState();
+ if (state == Bundle.ACTIVE) {
+ allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ } else {
+ return;
+ }
+
+ Set<IProject> validRefs = new HashSet<IProject>();
+ for (Object o : updated) {
+ IProject sourceProject = (IProject) o;
+ IVirtualComponent component = ComponentCore.createComponent(sourceProject);
+ if (component != null && component instanceof VirtualComponent) {
+ validRefs.clear();
+ ((VirtualComponent)component).flushCache();
+ IVirtualReference[] references = ((VirtualComponent)component).getRawReferences();
+ for (IVirtualReference ref : references) {
+ IVirtualComponent targetComponent = ref.getReferencedComponent();
+ if (targetComponent != null) {
+ IProject targetProject = targetComponent.getProject();
+ if (targetProject != null && !targetProject.equals(sourceProject)) {
+ validRefs.add(targetProject);
+ }
+ }
+ }
+ synchronized (graphLock) {
+ for (IProject targetProject : allProjects) {
+ // if the reference was identified
+ // above, be sure to add it
+ // otherwise, remove it
+ if (validRefs.remove(targetProject)) {
+ addReference(sourceProject, targetProject, event);
+ } else {
+ removeReference(sourceProject, targetProject, event);
+ }
+ }
+ }
+ } else {
+ // if this project is not a component, then it
+ // should be completely removed.
+ removeAllReferences(sourceProject, event);
+ }
}
}
+ notifiyListeners(event);
}
- boolean scheduleUpdate = false;
- synchronized (graphLock) {
- if(referenceOptions != null){
- scheduleUpdate = true;
- referenceOptions = null;
- }
- }
- if(scheduleUpdate){
- initAll();
- }
-
- }
- });
- // System.err.println(IDependencyGraph.INSTANCE);
- return Status.OK_STATUS;
+ });
+ return Status.OK_STATUS;
+ } finally {
+ setRunning(false);
+ jobILock.release();
+ }
}
};
+ public void addListener(IDependencyGraphListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(IDependencyGraphListener listener) {
+ listeners.remove(listener);
+ }
+
+ private void notifiyListeners(final DependencyGraphEvent event) {
+ if(event.getType() == 0){
+ return;
+ }
+ //fire notifications on a different job so they do not block waitForAllUpdates()
+ Job notificationJob = new Job(Resources.NOTIFICATION_JOB_NAME){
+ @Override
+ protected IStatus run(final IProgressMonitor monitor) {
+ SafeRunner.run(new ISafeRunnable() {
+ public void run() throws Exception {
+ for(Object listener : listeners.getListeners()){
+ ((IDependencyGraphListener)listener).dependencyGraphUpdate(event);
+ }
+ monitor.done();
+ }
+
+ public void handleException(Throwable exception) {
+ ModulecorePlugin.logError(exception);
+ }
+ });
+ return Status.OK_STATUS;
+ }
+ };
+ notificationJob.setSystem(true);
+ notificationJob.setRule(null);
+ notificationJob.schedule();
+ }
+
+
/**
+ * Use: update(project, IDependencyGraph.ADDED);
* @deprecated use {@link #update(IProject, int)}
*/
public void queueProjectAdded(IProject project) {
@@ -402,6 +574,7 @@
}
/**
+ * Use: update(project, IDependencyGraph.REMOVED);
* @deprecated use {@link #update(IProject, int)}
*/
public void queueProjectDeleted(IProject project) {
@@ -409,6 +582,7 @@
}
/**
+ * Use: update(project, IDependencyGraph.MODIFIED);
* @deprecated use {@link #update(IProject, int)}
*/
public void update(IProject project) {
@@ -461,22 +635,61 @@
graphUpdateJob.schedule(JOB_DELAY);
}
- /**
- * Blocks until the graph is finished updating
- */
public void waitForAllUpdates(IProgressMonitor monitor) {
- Thread graphUpdateThread = graphUpdateJob.getThread();
- if(graphUpdateThread != null && graphUpdateThread != Thread.currentThread()) {
- try {
- graphUpdateJob.join();
- } catch (InterruptedException e) {
- ModulecorePlugin.logError(e);
+ SubMonitor subMonitor = SubMonitor.convert(monitor);
+ subMonitor.subTask(Resources.WAITING);
+
+ Job currentJob = Job.getJobManager().currentJob();
+ if (currentJob != graphUpdateJob) {
+ if(Job.getJobManager().isSuspended()){
+ Job.getJobManager().resume();
}
+ while(isUpdateNecessary()){
+ if(subMonitor.isCanceled()){
+ throw new OperationCanceledException();
+ }
+
+ // Ensure any pending work has caused the job to become scheduled
+ if(graphUpdateJob.shouldSchedule()){
+ graphUpdateJob.schedule();
+ }
+ // Wake up any sleeping jobs since we're going to wait on the job,
+ // there is no sense to wait for a sleeping job
+ graphUpdateJob.wakeUp();
+ if(currentJob != null && !ResourcesPlugin.getWorkspace().isTreeLocked()){
+ currentJob.yieldRule(subMonitor.newChild(100));
+ }
+
+ graphUpdateJob.waitForRun(500);
+
+ boolean interrupted = false;
+ try {
+ if(jobILock.acquire(500)){
+ jobILock.release();
+ //only exit if the job has had a chance to run
+ if(!isUpdateNecessary()){
+ break;
+ }
+ }
+ } catch (InterruptedException e) {
+ interrupted = true;
+ } finally{
+ if(interrupted){
+ // Propagate interrupts
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+ }
+ if(null != monitor){
+ monitor.done();
}
-
- if(graphUpdateJob.shouldSchedule()){
- graphUpdateJob.run(monitor);
- }
+ }
+
+ // necessary if the job is running, waiting, or sleeping
+ // or there is anything in the graphqueue
+ private boolean isUpdateNecessary() {
+ return graphUpdateJob.getState() != Job.NONE || graphUpdateJob.shouldSchedule();
}
public String toString() {
@@ -498,5 +711,16 @@
}
}
+
+ public static final class Resources extends NLS {
+ public static String WAITING;
+ public static String JOB_NAME;
+ public static String NOTIFICATION_JOB_NAME;
+
+ static
+ {
+ initializeMessages( DependencyGraphImpl.class.getName(), Resources.class );
+ }
+ }
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties
new file mode 100644
index 0000000..b8552a8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties
@@ -0,0 +1,3 @@
+WAITING=Waiting
+JOB_NAME=Graph Update
+NOTIFICATION_JOB_NAME=Graph Update Notification
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
index aa4f58c..07442a1 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
@@ -72,6 +72,10 @@
* if the project dependencies ever change.
*/
public long getModStamp();
+
+ public void addListener(IDependencyGraphListener listener);
+
+ public void removeListener(IDependencyGraphListener listener);
/**
* WARNING: this should only be called by implementors of the
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphListener.java
similarity index 60%
rename from plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
rename to plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphListener.java
index d0a34bf..c1f637b 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphListener.java
@@ -1,22 +1,17 @@
/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * 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.validation.internal.operations;
+package org.eclipse.wst.common.componentcore.internal.builder;
+public interface IDependencyGraphListener {
-/**
- * This type is not intended to be extended by clients.
- */
-public interface IResourceUtil {
- /**
- * Return the line number where the Object is located.
- */
- public int getLineNo(Object obj);
-}
\ No newline at end of file
+ public void dependencyGraphUpdate(IDependencyGraphUpdateEvent event);
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java
new file mode 100644
index 0000000..0d1094b
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * 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.internal.builder;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IDependencyGraphUpdateEvent {
+
+ public static int ADDED = 1;
+ public static int REMOVED = 2;
+
+
+ /**
+ * Returns a bitwise or of the reference change types.
+ *
+ * @see {@link #ADDED} {@link #REMOVED}
+ * @return
+ */
+ public abstract int getType();
+
+ /**
+ * Returns the modification stamp for the last update change in the
+ * {@link IDependencyGraph} being notified by this event.
+ *
+ * Note that updates to the {@link IDependencyGraph} may be queued so
+ * several are handled by a single event.
+ *
+ * @see IDependencyGraph#getModStamp()
+ *
+ * @return
+ */
+ public abstract long getModStamp();
+
+ /**
+ * The key contains the referenced component, the value contains the set of
+ * referencing components recently added. This map will only contain the
+ * changes since the last event was fired. If {@link #getType()} |
+ * {@link #ADDED} != {@link #ADDED} then this will be an empty map.
+ *
+ * Note that the changes specified by this map do not necessarily reflect
+ * the current state of the {@link IDependencyGraph} because it is possible
+ * that additional changes have occurred since this event was fired.
+ * {@link IDependencyGraph#getReferencingComponents(IProject)} will return
+ * the current reference state.
+ *
+ * @return
+ */
+ public abstract Map<IProject, Set<IProject>> getAddedReferences();
+
+ /**
+ * The key contains the referenced component, the value contains the set of
+ * referencing components recently removed. This map will only contain the
+ * changes since the last event was fired. If {@link #getType()} |
+ * {@link #REMOVED} != {@link #REMOVED} then this will be an empty map.
+ *
+ * Note that the changes specified by this map do not necessarily reflect
+ * the current state of the {@link IDependencyGraph} because it is possible
+ * that additional changes have occurred since this event was fired.
+ * {@link IDependencyGraph#getReferencingComponents(IProject)} will return
+ * the current reference state.
+ *
+ * @return
+ */
+ public abstract Map<IProject, Set<IProject>> getRemovedReferences();
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java
new file mode 100644
index 0000000..024f710
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.util.List;
+
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+/**
+ * A simple abstract class with default values so clients
+ * can extend and override only the method they care about
+ */
+public class AbstractFlattenParticipant implements IFlattenParticipant {
+
+ public void initialize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
+ }
+
+ public boolean canOptimize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel) {
+ return false;
+ }
+
+ public void optimize(IVirtualComponent component, FlatComponentTaskModel dataModel,
+ List<IFlatResource> resources, List<IChildModuleReference> childModules) {
+ }
+
+ public void finalize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
+ }
+
+ public boolean isChildModule(IVirtualComponent rootComponent,
+ FlatComponentTaskModel dataModel, IFlatFile file) {
+ return false;
+ }
+
+ public boolean isChildModule(IVirtualComponent rootComponent,
+ IVirtualReference referenced, FlatComponentTaskModel dataModel) {
+ return false;
+ }
+
+ public boolean shouldAddExportableFile(IVirtualComponent rootComponent,
+ IVirtualComponent currentComponent, FlatComponentTaskModel dataModel,
+ IFlatFile file) {
+ return true;
+ }
+
+ public boolean shouldIgnoreReference(IVirtualComponent rootComponent,
+ IVirtualReference referenced, FlatComponentTaskModel dataModel) {
+ return false;
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/ChildModuleReference.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/ChildModuleReference.java
new file mode 100644
index 0000000..f48af99
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/ChildModuleReference.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+/**
+ * Clients of this class will need to pay attention to
+ * if this module is binary or not. If it's binary, you
+ * should get the file, and copy it directly to the URI provided.
+ *
+ * If it's not binary, you should use the provided uri
+ * as a base from which you can append it's member resources
+ *
+ * String parentRelative = module.getRelativeURI(); // path/to/childmod.jar
+ * String uri = parentLoc.append(parentRelative);
+ * if( module.isBinary()) {
+ * File f = module.getFile();
+ * // copy file f to uri;
+ * } else {
+ * ExportModel em = new ExportModel(module.getComponent());
+ * ExportableResource[] members = em.fetchResources();
+ * String uri1 = uri.append(members[1].getModuleRelativePath());
+ * String uri2 = ....
+ * }
+ * @author rob
+ *
+ */
+public class ChildModuleReference implements IChildModuleReference {
+ private IProject project;
+ private File file;
+ private IVirtualComponent component;
+ private IVirtualReference reference;
+ private IPath uri;
+ public ChildModuleReference(IProject project, IFlatFile f) {
+ this.project = project;
+ this.file = f == null ? null : (File)f.getAdapter(File.class);
+ if( f != null && file != null ) {
+ this.uri = f.getModuleRelativePath().append(f.getName());
+ }
+ }
+
+ public ChildModuleReference(IVirtualReference reference, IPath root) {
+ this.reference = reference;
+ this.component = reference.getReferencedComponent();
+ this.project = this.component.getProject();
+ if( component.isBinary() ) {
+ File f = (File)component.getAdapter(File.class);
+ if( f.exists() && f.isFile()) {
+ this.file = f;
+ }
+ }
+ this.uri = root.append(reference.getRuntimePath()).append(reference.getArchiveName());
+ }
+
+ /**
+ * Will return a file if this can be tracked to one
+ * @return
+ */
+ public File getFile() {
+ return file;
+ }
+
+ public IVirtualReference getReference() {
+ return reference;
+ }
+
+ /**
+ * Return the component if it exists
+ * @return
+ */
+ public IVirtualComponent getComponent() {
+ if( component != null )
+ return component;
+ if( file != null )
+ return new VirtualArchiveComponent(project, VirtualArchiveComponent.LIBARCHIVETYPE + "/" + file.getAbsolutePath(), new Path("/"));
+ return null;
+ }
+
+ /**
+ * If this is a single file, return true.
+ * If a more complex component, return false
+ * @return
+ */
+ public boolean isBinary() {
+ return component == null || component.isBinary();
+ }
+
+ /**
+ * Get the relative URI to it's direct parent,
+ * including path + filename + extension
+ * @return
+ */
+ public IPath getRelativeURI() {
+ return uri;
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FilterResourceParticipant.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FilterResourceParticipant.java
new file mode 100644
index 0000000..635caa6
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FilterResourceParticipant.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+
+public class FilterResourceParticipant extends AbstractFlattenParticipant {
+ public interface IExportableResourceFilter {
+ public boolean accepts(IFlatResource resource);
+ }
+
+ public static class FilterExtensionsParticipant implements IExportableResourceFilter {
+ private String[] bannedExtensions;
+ public FilterExtensionsParticipant(String[] extensions) {
+ this.bannedExtensions = extensions;
+ }
+ public boolean accepts(IFlatResource resource) {
+ IFile ifile = (IFile)resource.getAdapter(IFile.class);
+ String name = null;
+ if( ifile != null ) {
+ name = ifile.getName();
+ } else {
+ File f = (File)resource.getAdapter(File.class);
+ if( f != null )
+ name = f.getName();
+ }
+ if( name != null) {
+ for( int i = 0; i < bannedExtensions.length; i++ ) {
+ if( name.endsWith(bannedExtensions[i]))
+ return false;
+ }
+ return true;
+ }
+ return false;
+ }
+ }
+
+ public static FilterResourceParticipant createSuffixFilterParticipant(String[] strings) {
+ return new FilterResourceParticipant(new FilterExtensionsParticipant(strings));
+ }
+
+ private IExportableResourceFilter filter;
+ public FilterResourceParticipant(IExportableResourceFilter filter) {
+ this.filter = filter;
+ }
+
+ public boolean shouldAddExportableFile(IVirtualComponent rootComponent,
+ IVirtualComponent currentComponent, FlatComponentTaskModel dataModel,
+ IFlatFile file) {
+ return filter.accepts(file);
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFile.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFile.java
new file mode 100644
index 0000000..84639f8
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFile.java
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.flat;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * A deployable file
+ */
+public class FlatFile extends FlatResource implements IFlatFile {
+ private InputStream stream;
+ private IFile file;
+ private File file2;
+ private String name;
+ private IPath path;
+ private long stamp = -1;
+
+ /**
+ * Creates a workspace module file with the current modification stamp.
+ *
+ * @param file a file in the workspace
+ * @param name a name
+ * @param path the path to the file
+ */
+ public FlatFile(IFile file, String name, IPath path) {
+ if (name == null)
+ throw new IllegalArgumentException();
+ this.file = file;
+ this.name = name;
+ this.path = path;
+ if (file != null)
+ stamp = file.getModificationStamp() + file.getLocalTimeStamp();
+ }
+
+ /**
+ * Creates an external module file
+ *
+ * @param file
+ * @param name
+ * @param path
+ */
+ public FlatFile(File file, String name, IPath path) {
+ if (name == null)
+ throw new IllegalArgumentException();
+ this.file2 = file;
+ this.name = name;
+ this.path = path;
+ if (file2 != null)
+ stamp = file2.lastModified();
+ }
+
+ /**
+ * Creates an unknown module file with a specific modification stamp.
+ *
+ * @param file
+ * @param name
+ * @param path
+ * @param stamp
+ */
+ public FlatFile(InputStream is, String name, IPath path, long stamp) {
+ if (name == null)
+ throw new IllegalArgumentException();
+ this.stream = is;
+ this.name = name;
+ this.path = path;
+ this.stamp = stamp;
+ }
+
+ /**
+ * Creates an unknown module file with the current modification stamp.
+ *
+ * @param file
+ * @param name
+ * @param path
+ */
+ public FlatFile(InputStream is, String name, IPath path) {
+ this(is, name, path, System.currentTimeMillis());
+ }
+
+ /**
+ * Creates a module file with a specific modification stamp and no
+ * file reference.
+ *
+ * @param name
+ * @param path
+ * @param stamp
+ */
+ public FlatFile(String name, IPath path, long stamp) {
+ if (name == null)
+ throw new IllegalArgumentException();
+ this.name = name;
+ this.path = path;
+ this.stamp = stamp;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleFile#getModificationStamp()
+ */
+ public long getModificationStamp() {
+ return stamp;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleResource#getModuleRelativePath()
+ */
+ public IPath getModuleRelativePath() {
+ return path;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleResource#getName()
+ */
+ public String getName() {
+ return name;
+ }
+
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+
+ if (!(obj instanceof FlatFile))
+ return false;
+
+ FlatFile mf = (FlatFile) obj;
+ if (!name.equals(mf.getName()))
+ return false;
+ if (!path.equals(mf.getModuleRelativePath()))
+ return false;
+ return true;
+ }
+
+ public int hashCode() {
+ return name.hashCode() * 37 + path.hashCode();
+ }
+
+ public Object getAdapter(Class cl) {
+ if (IFile.class.equals(cl) || IResource.class.equals(cl))
+ return file;
+ else if (File.class.equals(cl)) {
+ if( file2 != null )
+ return file2;
+ if( file != null )
+ return file.getLocation().toFile();
+ }
+ else if( InputStream.class.equals(cl)) {
+ try {
+ if( stream != null )
+ return stream;
+ if( file2 != null && file2.exists())
+ return new FileInputStream(file2);
+ if( file != null && file.exists())
+ return new FileInputStream(file.getLocation().toFile());
+ } catch( IOException ioe) {
+ // Do Nothing
+ }
+ }
+ return null;
+ }
+
+ public String toString() {
+ return "DeployableFile [" + name + ", " + path + ", " + stamp + "]";
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
new file mode 100644
index 0000000..c55c023
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.flat;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * An implementation of {@link IFlatFolder} for physical folders on disk or in the
+ * workspace.
+ */
+public class FlatFolder extends FlatResource implements IFlatFolder {
+ private static final FlatResource[] EMPTY_RESOURCE_ARRAY = new FlatResource[0];
+
+ private IContainer container;
+ private String name;
+ private IPath path;
+ private IFlatResource[] members;
+
+ /**
+ * Creates a module folder.
+ *
+ * @param container the container, or <code>null</code> for unknown container
+ * @param name a name
+ * @param path the module relative path to the folder
+ */
+ public FlatFolder(IContainer container, String name, IPath path) {
+ if (name == null)
+ throw new IllegalArgumentException();
+ this.container = container;
+ this.name = name;
+ this.path = path;
+ }
+
+ /**
+ * Sets the members (contents) of this folder.
+ *
+ * @param members the members
+ */
+ public void setMembers(IFlatResource[] members) {
+ this.members = members;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleResource#getModuleRelativePath()
+ */
+ public IPath getModuleRelativePath() {
+ return path;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleResource#getName()
+ */
+ public String getName() {
+ return name;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.core.model.IModuleFolder#members()
+ */
+ public IFlatResource[] members() {
+ if (members == null)
+ return EMPTY_RESOURCE_ARRAY;
+ return members;
+ }
+
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+
+ if (!(obj instanceof FlatFolder))
+ return false;
+
+ FlatFolder mf = (FlatFolder) obj;
+ if (!name.equals(mf.name))
+ return false;
+ if (!path.equals(mf.path))
+ return false;
+ return true;
+ }
+
+ public int hashCode() {
+ return name.hashCode() * 37 + path.hashCode();
+ }
+
+ public Object getAdapter(Class cl) {
+ if (container != null) {
+ if (IContainer.class.equals(cl) || IFolder.class.equals(cl) || IResource.class.equals(cl))
+ return container;
+ if( File.class.equals(cl))
+ return container.getLocation().toFile();
+ }
+ return null;
+ }
+
+ public String toString() {
+ return "DeployableFolder [" + name + ", " + path + "]";
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatResource.java
new file mode 100644
index 0000000..ff6f174
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatResource.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.flat;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+
+public abstract class FlatResource implements IFlatResource, IAdaptable {
+ /**
+ * Returns the module relative path to this resource.
+ *
+ * @return the module relative path to this resource
+ */
+ public abstract IPath getModuleRelativePath();
+
+ /**
+ * Returns the name of this resource.
+ *
+ * @return the name of this resource
+ */
+ public abstract String getName();
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java
new file mode 100644
index 0000000..299c5b9
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java
@@ -0,0 +1,359 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.internal.DependencyType;
+import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility.ShouldIncludeUtilityCallback;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+public class FlatVirtualComponent implements IFlatVirtualComponent, ShouldIncludeUtilityCallback {
+
+ public static class FlatComponentTaskModel extends HashMap<Object, Object> {
+ private static final long serialVersionUID = 1L;
+ }
+
+ /**
+ * The datamodel, which may contain preferences, settings, or other data
+ * used by the various participants to determine how to properly
+ * traverse this component.
+ */
+ private FlatComponentTaskModel dataModel;
+
+ /**
+ * The root component being flattened.
+ */
+ private IVirtualComponent component;
+
+ /**
+ * The list of participants to engage in the flattening process.
+ */
+ private IFlattenParticipant[] participants;
+
+ /**
+ * The list of member resources for this component
+ */
+ private List<IFlatResource> members = null;
+
+ /**
+ * The list of child modules for this component
+ */
+ private List<IChildModuleReference> children = null;
+
+
+ public FlatVirtualComponent(IVirtualComponent component) {
+ this(component, new FlatComponentTaskModel());
+ }
+
+ public FlatVirtualComponent(IVirtualComponent component, FlatComponentTaskModel dataModel) {
+ this.component = component;
+ this.dataModel = dataModel;
+ participants = setParticipants();
+ dataModel.put(EXPORT_MODEL, this);
+ }
+
+ /**
+ * Set the list of participants for this virtual component.
+ * This is pulled from the datamodel.
+ */
+ protected IFlattenParticipant[] setParticipants() {
+ Object o = dataModel.get(PARTICIPANT_LIST);
+ if( o != null ) {
+ if( o instanceof IFlattenParticipant )
+ return new IFlattenParticipant[] { (IFlattenParticipant)o};
+ if( o instanceof IFlattenParticipant[])
+ return (IFlattenParticipant[])o;
+ if( o instanceof List ) {
+ List<IFlattenParticipant> l = (List<IFlattenParticipant>)o;
+ return (IFlattenParticipant[]) l
+ .toArray(new IFlattenParticipant[l.size()]);
+ }
+ }
+ return new IFlattenParticipant[]{};
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent#fetchResources()
+ */
+ public IFlatResource[] fetchResources() throws CoreException {
+ if( members == null)
+ cacheResources();
+ return (FlatResource[]) members.toArray(new FlatResource[members.size()]);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent#getChildModules()
+ */
+ public IChildModuleReference[] getChildModules() throws CoreException {
+ if( members == null )
+ cacheResources();
+ return (ChildModuleReference[]) children.toArray(new ChildModuleReference[children.size()]);
+ }
+
+
+ protected void cacheResources() throws CoreException {
+ runInitializations();
+ if( canOptimize()) {
+ optimize(members, children);
+ } else {
+ treeWalk();
+ runFinalizations(members);
+ }
+ }
+
+ protected void runInitializations() {
+ members = new ArrayList<IFlatResource>();
+ children = new ArrayList<IChildModuleReference>();
+ for( int i = 0; i < participants.length; i++ ) {
+ participants[i].initialize(component, dataModel, members);
+ }
+ }
+
+ protected boolean canOptimize() {
+ for( int i = 0; i < participants.length; i++ ) {
+ if( participants[i].canOptimize(component, dataModel))
+ return true;
+ }
+ return false;
+ }
+
+ protected void optimize(List<IFlatResource> resources, List<IChildModuleReference> children) {
+ for( int i = 0; i < participants.length; i++ ) {
+ if( participants[i].canOptimize(component, dataModel)) {
+ participants[i].optimize(component, dataModel, resources, children);
+ return;
+ }
+ }
+ }
+
+ protected void runFinalizations(List<IFlatResource> resources) {
+ for( int i = 0; i < participants.length; i++ ) {
+ participants[i].finalize(component, dataModel, resources);
+ }
+ }
+
+ protected void treeWalk() throws CoreException {
+ if (component != null) {
+ VirtualComponentFlattenUtility util = new VirtualComponentFlattenUtility(members, this);
+ IVirtualFolder vFolder = component.getRootFolder();
+
+ // actually walk the tree
+ util.addMembers(component, vFolder, Path.EMPTY);
+
+ //addRelevantOutputFolders(); // to be done in a participant later
+
+ addConsumedReferences(util, component, new Path(""));
+ addUsedReferences(util, component, new Path(""));
+ }
+ }
+
+ /**
+ * Consumed references are, by definition, consumed, and should not
+ * be eligible to be exposed as child modules. They are consumed
+ * directly into the module tree.
+ *
+ * The reference in question may have references of its own, both
+ * used and consumed. References of the child will be treated
+ * as references of the parent, whether consumed or used.
+ *
+ * A key difference in the handling of non-child USED references
+ * as compared to CONSUMES is that CONSUMED references have their
+ * archiveName *ignored*, and its child members are directly consumed.
+ * In contrast, a USED non-child keeps its archiveName as the folder name.
+ *
+ * @param vc
+ */
+ protected void addConsumedReferences(VirtualComponentFlattenUtility util, IVirtualComponent vc, IPath root) throws CoreException {
+ List consumableMembers = new ArrayList();
+ Map<String, Object> options = new HashMap<String, Object>();
+ options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.FLATTENABLE_REFERENCES);
+ IVirtualReference[] refComponents = vc.getReferences(options);
+ for (int i = 0; i < refComponents.length; i++) {
+ IVirtualReference reference = refComponents[i];
+ if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_CONSUMES) {
+ consumeComponent(util, root, reference);
+ }
+ }
+ }
+
+ protected void consumeComponent(VirtualComponentFlattenUtility util, IPath root, IVirtualReference reference) throws CoreException {
+ IVirtualComponent consumedComponent = reference.getReferencedComponent();
+ if (consumedComponent.getRootFolder()!=null) {
+ IVirtualFolder vFolder = consumedComponent.getRootFolder();
+ util.addMembers(consumedComponent, vFolder, root.append(reference.getRuntimePath().makeRelative()));
+ addConsumedReferences(util, consumedComponent, root.append(reference.getRuntimePath().makeRelative()));
+ addUsedReferences(util, consumedComponent, root.append(reference.getRuntimePath().makeRelative()));
+ }
+ }
+
+ /**
+ * This checks to see if any exportable file is actually a child module.
+ * Children modules will be exposed via the getChildModules() method.
+ */
+ public boolean shouldAddComponentFile(IVirtualComponent current, IFlatFile file) {
+ for( int i = 0; i < participants.length; i++ ) {
+ if( participants[i].isChildModule(component, dataModel, file)) {
+ ChildModuleReference child = new ChildModuleReference(current.getProject(), file);
+ children.add(child);
+ return false;
+ } else if( !participants[i].shouldAddExportableFile(component, current, dataModel, file))
+ return false;
+ }
+ return true;
+ }
+
+ protected void addUsedReferences(VirtualComponentFlattenUtility util, IVirtualComponent vc, IPath root) throws CoreException {
+ Map<String, Object> options = new HashMap<String, Object>();
+ options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.FLATTENABLE_REFERENCES);
+ IVirtualReference[] allReferences = vc.getReferences(options);
+ for (int i = 0; i < allReferences.length; i++) {
+ IVirtualReference reference = allReferences[i];
+ IVirtualComponent virtualComp = reference.getReferencedComponent();
+ if (reference.getDependencyType() == DependencyType.USES ) {
+ if( shouldIgnoreReference(reference))
+ continue;
+
+ if( !isChildModule(reference)) {
+ addNonChildUsedReference(util, vc, reference, root.append(reference.getRuntimePath()));
+ } else {
+ ChildModuleReference cm = new ChildModuleReference(reference, root);
+ List<IChildModuleReference> duplicates = new ArrayList();
+ for( IChildModuleReference tmp : children ) {
+ if(tmp.getRelativeURI().equals(cm.getRelativeURI()))
+ duplicates.add(tmp);
+ }
+ children.removeAll(duplicates);
+ children.add(cm);
+ }
+ }
+ }
+ }
+
+ /**
+ * Should we expose this used reference as a member file?
+ *
+ * @param currentComponent the current component we're traversing
+ * @return true if it's a member file, false if it's a child module
+ */
+ protected boolean isChildModule(IVirtualReference referencedComponent) {
+ for( int i = 0; i < participants.length; i++ ) {
+ if( participants[i].isChildModule(component, referencedComponent, dataModel))
+ return true;
+ }
+ return false;
+ }
+
+ protected boolean shouldIgnoreReference(IVirtualReference referencedComponent) {
+ for( int i = 0; i < participants.length; i++ ) {
+ if( participants[i].shouldIgnoreReference(component, referencedComponent, dataModel))
+ return true;
+ }
+ return false;
+ }
+
+ protected void addNonChildUsedReference(VirtualComponentFlattenUtility util, IVirtualComponent parent,
+ IVirtualReference reference, IPath runtimePath) throws CoreException {
+ if( reference.getReferencedComponent().isBinary()) {
+ handleNonChildUsedBinaryReference(util, parent, reference, runtimePath);
+ } else /* !virtualComp.isBinary() */ {
+ /*
+ * used references to non-binary components that are NOT child modules.
+ * These should be 'consumed' but maintain their name
+ * As of now I don't believe there are any such instances of this.
+ * I also believe in most cases, this probably is a child module that
+ * the parent just doesn't know about.
+ *
+ * Example: Ear Project consumes ESB project, Ear project does not
+ * recognize ESB project as a child However, if the server adapter
+ * can use nested exploded deployments (folders instead of zips),
+ * then this will still work.
+ *
+ * TODO Investigate / Discuss
+ */
+ util.addMembers(reference.getReferencedComponent(), reference.getReferencedComponent().getRootFolder(),
+ runtimePath.append(reference.getArchiveName()));
+ }
+ }
+
+ protected void handleNonChildUsedBinaryReference(VirtualComponentFlattenUtility util, IVirtualComponent parent,
+ IVirtualReference reference, IPath runtimePath) throws CoreException {
+ // Binary used references must be added as a single file unless they're child modules
+ final String archiveName2 = reference.getArchiveName();
+ final String archiveName = new Path(archiveName2).lastSegment();
+ final IVirtualComponent virtualComp = reference.getReferencedComponent();
+ FlatFile mf = null;
+ IFile ifile = (IFile)virtualComp.getAdapter(IFile.class);
+ if( ifile != null ) {
+ String name = null != archiveName ? archiveName : ifile.getName();
+ mf = new FlatFile(ifile, name, runtimePath.makeRelative());
+ } else {
+ File extFile = (File)virtualComp.getAdapter(File.class);
+ if( extFile != null ) {
+ String name = null != archiveName ? archiveName : extFile.getName();
+ mf = new FlatFile(extFile, name, runtimePath.makeRelative());
+ }
+ }
+
+ if( mf != null ) {
+ IFlatResource moduleParent = VirtualComponentFlattenUtility.getExistingModuleResource(members, mf.getModuleRelativePath());
+ if (moduleParent != null && moduleParent instanceof IFlatFolder) {
+ IFlatResource[] mf_members = ((IFlatFolder)moduleParent).members();
+ for (int i = 0; i < mf_members.length; i++) {
+ if (mf_members[i].getName().equals(mf.getName()))
+ return;
+ }
+ VirtualComponentFlattenUtility.addMembersToModuleFolder((IFlatFolder)moduleParent, new FlatResource[]{mf});
+ } else {
+ if( shouldAddExportableFile(virtualComp, mf)) {
+ if (mf.getModuleRelativePath().isEmpty()) {
+ for( IFlatResource tmp : members)
+ if( tmp.getName().equals(mf.getName()))
+ return;
+ members.add(mf);
+ } else {
+ if (moduleParent == null) {
+ moduleParent = VirtualComponentFlattenUtility.ensureParentExists(members, mf.getModuleRelativePath(), (IContainer)parent.getRootFolder().getUnderlyingResource());
+ }
+ VirtualComponentFlattenUtility.addMembersToModuleFolder((IFlatFolder)moduleParent, new FlatResource[] {mf});
+ }
+ } else {
+ // Automatically added to children if it needed to be
+ }
+ }
+ }
+ }
+
+ protected boolean shouldAddExportableFile(IVirtualComponent current, FlatFile file) {
+ for( int i = 0; i < participants.length; i++ ) {
+ if ( !participants[i].shouldAddExportableFile(component, current, dataModel, file))
+ return false;
+ }
+ return true;
+ }
+
+ public IVirtualComponent getComponent() {
+ return component;
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IChildModuleReference.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IChildModuleReference.java
new file mode 100644
index 0000000..963f0e5
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IChildModuleReference.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+/**
+ * A child module may be based on a file (if binary),
+ * or on a reference / component if not.
+ *
+ * This interface is not intended to be implemented by clients
+ */
+public interface IChildModuleReference {
+ /**
+ * Will return a file if this can be tracked to one
+ * @return
+ */
+ public File getFile();
+
+
+ /**
+ * Return the reference if it exists
+ * @return
+ */
+ public IVirtualReference getReference();
+
+ /**
+ * Return the component if it exists
+ * @return
+ */
+ public IVirtualComponent getComponent();
+
+ /**
+ * If this is a single file, return true.
+ * If a more complex component, return false
+ * @return
+ */
+ public boolean isBinary();
+
+ /**
+ * Get the relative URI to it's direct parent,
+ * including path + filename + extension
+ * @return
+ */
+ public IPath getRelativeURI();
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFile.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFile.java
new file mode 100644
index 0000000..6a649b7
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFile.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+/**
+ *
+ * This interface is not intended to be implemented by clients
+ *
+ */
+public interface IFlatFile extends IFlatResource {
+ /**
+ * Returns a modification stamp. Whenever the modification
+ * stamp changes, there may have been a change to the file.
+ *
+ * @return the modification stamp
+ */
+ public long getModificationStamp();
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFolder.java
new file mode 100644
index 0000000..aedcf50
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatFolder.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.flat;
+
+/**
+ *
+ * This interface is not intended to be implemented by clients
+ *
+ */
+public interface IFlatFolder extends IFlatResource {
+ /**
+ * Returns the members (contents) of this folder.
+ *
+ * @return an array containing the module resources contained in this folder
+ */
+ public IFlatResource[] members();
+ /**
+ * Sets the members (contents) of this folder.
+ *
+ * @param members the members
+ */
+ public void setMembers(IFlatResource[] members);
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatResource.java
new file mode 100644
index 0000000..fdb9197
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatResource.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ *
+ * This interface is not intended to be implemented by clients
+ *
+ */
+public interface IFlatResource extends IAdaptable {
+ /**
+ * Returns the module relative path to this resource.
+ *
+ * @return the module relative path to this resource
+ */
+ public IPath getModuleRelativePath();
+
+ /**
+ * Returns the name of this resource.
+ *
+ * @return the name of this resource
+ */
+ public String getName();
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatVirtualComponent.java
new file mode 100644
index 0000000..81b9b85
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlatVirtualComponent.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import org.eclipse.core.runtime.CoreException;
+
+public interface IFlatVirtualComponent {
+
+ /**
+ * An options key listing the export participants.
+ * The value must be a List<IExportUtilParticipant>,
+ * or simply an IExportUtilParticipant
+ */
+ public static String PARTICIPANT_LIST = "org.eclipse.wst.common.componentcore.export.participantList";
+
+ /**
+ * The ExportModel being used; the value of this should be the IFlatVirtualComponent itself.
+ */
+ public static String EXPORT_MODEL = "org.eclipse.wst.common.componentcore.export.exportModel";
+
+ /**
+ * Fetch the list of resources, which include raw files or folders only
+ * @return
+ * @throws CoreException
+ */
+ public IFlatResource[] fetchResources() throws CoreException;
+
+ /**
+ * Fetch a list of child module references.
+ * @return
+ * @throws CoreException
+ */
+ public IChildModuleReference[] getChildModules() throws CoreException;
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java
new file mode 100644
index 0000000..54fd742
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.util.List;
+
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+/**
+ * This class represents a participant in the process
+ * of traversing the virtual component and deciding which
+ * resources should be exposed by the model, and
+ * in what fashion.
+ *
+ * Clients should not implement this class directly,
+ * but should rather extend AbstractExportParticipant.
+ */
+public interface IFlattenParticipant {
+
+ /**
+ * Seed the list of resources with entries that must be present,
+ * specifically files that may be missed by optimizations.
+ *
+ * @param component
+ * @param dataModel
+ * @param original
+ * @return
+ */
+ public void initialize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel, List<IFlatResource> resources);
+
+ /**
+ * Can this participant return optimized members that
+ * preclude the need for running the full algorithm?
+ *
+ * Caution is encouraged. If reference types you do not understand
+ * are present and you mistakenly claim you canOptimize, you may
+ * leave some references ignored and the archive incompletely assembled.
+ *
+ * Example: if the component satisfies singleRoot requirements, this may return true
+ *
+ * @param component
+ * @param dataModel
+ * @return
+ */
+ public boolean canOptimize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel);
+
+ /**
+ * Return a full and complete list of members to be published.
+ * The original entries should be included, unless left out intentionally.
+ *
+ * Only the first participant to claim it can optimize will be allowed to do so.
+ * This will be the final list returned by ExportUtil.
+ * No finalization or other actions on this list will take place
+ *
+ * @param component
+ * @param dataModel
+ * @param original
+ * @return
+ */
+ public void optimize(IVirtualComponent component, FlatComponentTaskModel dataModel,
+ List<IFlatResource> resources, List<IChildModuleReference> children);
+
+ /**
+ * Returns true if this participant considers this file to be a child module
+ * The framework will consider the file a child module if at least one participant
+ * returns true to this method.
+ *
+ * The item in question is a flat file which has been found inside the project
+ * or inside a consumed reference of the project. The framework is asking
+ * all participants if this file is a child module, to be exposed as such later,
+ * or if it is just a generic resource, which should be exposed as a regular member file.
+ *
+ * @param rootComponent
+ * @param dataModel
+ * @param file
+ * @return
+ */
+ public boolean isChildModule(IVirtualComponent rootComponent,
+ FlatComponentTaskModel dataModel, IFlatFile file);
+
+
+ /**
+ * Should the proposed file be included in the result set or not.
+ * If any one participant says no, the file will not be included.
+ * The default behaviour would be to return true unless you
+ * have a compelling reason to block the file from inclusion
+ *
+ * Example: If the file is being actively filtered (in a .svn folder) return false
+ * Caution is encouraged here, as a consumed reference may actively
+ * be providing the files you may be trying to filter. It's advised to only
+ * filter if you know what type currentComponent is and how it works.
+ *
+ * @param rootComponent The root component that is being assembled
+ * @param currentComponent The component currently being processed, either rootComponent or a consumed reference
+ * @param dataModel
+ * @param file
+ * @return
+ */
+ public boolean shouldAddExportableFile(IVirtualComponent rootComponent,
+ IVirtualComponent currentComponent,
+ FlatComponentTaskModel dataModel, IFlatFile file);
+
+
+ /**
+ * Returns true if this participant considers the reference a child module.
+ * The framework will consider it a child module if at least one participant returns true.
+ *
+ * The framework is asking whether the referenced component is a child module,
+ * which should be added to the list of children modules and exposed as an
+ * IChildModuleReference, or if it is just some generic type of entity to be
+ * exposed as member resources inside the current flat component.
+ *
+ * The parameter "referenced" is guaranteed to be a "USED" reference,
+ * as "CONSUMED" references have already been consumed directly into the project
+ * as if they were part of it originally.
+ *
+ * A "USED" reference which is a child module will be exposed as an
+ * IChildModuleReference and use the archiveName retrieved from the IVirtualReference.
+ *
+ * A "USED" reference which is *not* a child module will be represented
+ * as a folder member resource inside the parent, and the folder's name will
+ * also be retrieved from the archiveName attribute of the IVirtualReference.
+ *
+ * @param rootComponent
+ * @param referenced
+ * @param dataModel
+ * @return
+ */
+ public boolean isChildModule(IVirtualComponent rootComponent,
+ IVirtualReference referenced, FlatComponentTaskModel dataModel);
+
+ /**
+ * Should this reference be ignored, ie handled elsewhere
+ * @param rootComponent
+ * @param referenced
+ * @param dataModel
+ * @return
+ */
+ public boolean shouldIgnoreReference(IVirtualComponent rootComponent,
+ IVirtualReference referenced, FlatComponentTaskModel dataModel);
+ /**
+ * Finalize the list of resources by adding missed resources or
+ * removing files added by mistake.
+ *
+ * @param component
+ * @param dataModel
+ * @param original
+ * @param resources
+ * @return
+ */
+ public void finalize(IVirtualComponent component,
+ FlatComponentTaskModel dataModel, List<IFlatResource> resources);
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java
new file mode 100644
index 0000000..01aad61
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.flat;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
+
+/**
+ * This utility class is almost entirely copied from ComponentDeployable
+ * and deals with the nuts and bolts of creating the model objects when
+ * walking a portion of the tree
+ */
+public class VirtualComponentFlattenUtility {
+ public static interface ShouldIncludeUtilityCallback {
+ public boolean shouldAddComponentFile(IVirtualComponent current, IFlatFile file);
+ }
+
+ private List<IFlatResource> members;
+ private ShouldIncludeUtilityCallback handler;
+ public VirtualComponentFlattenUtility(
+ List<IFlatResource> members, ShouldIncludeUtilityCallback handler) {
+ this.members = members;
+ this.handler = handler;
+ }
+
+ public void addMembers(IVirtualComponent current, IVirtualContainer cont, IPath path) throws CoreException {
+ ensureParentExists(members, path, null);
+ FlatResource[] mr = addMembersInternal(current, cont, path);
+ int size = mr.length;
+ for (int j = 0; j < size; j++) {
+ members.add(mr[j]);
+ }
+ }
+
+ // Add this container's children
+ public void addContainer(IContainer container, IPath path) throws CoreException {
+ IResource[] children = container.members();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i] instanceof IContainer ) {
+ addContainerInternal((IContainer)children[i], path);
+ } else if( children[i] instanceof IFile ){
+ addFile(null, (IFile)children[i], path);
+ }
+ }
+ }
+
+ // Physically adds this container
+ protected void addContainerInternal(IContainer container, IPath path) throws CoreException {
+ IFlatFolder mf = (FlatFolder) getExistingModuleResource(members,path.append(container.getName()).makeRelative());
+ if( mf == null ) {
+ mf = new FlatFolder(container, container.getName(), path);
+ IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
+ if (path.isEmpty())
+ members.add(mf);
+ else {
+ if (parent == null)
+ parent = ensureParentExists(members, path, container);
+ addMembersToModuleFolder(parent, new IFlatResource[] {mf});
+ }
+ }
+ // recurse
+ addContainer(container, path.append(container.getName()));
+ }
+
+ protected FlatResource[] addMembersInternal(IVirtualComponent current, IVirtualContainer cont, IPath path) throws CoreException {
+ IVirtualResource[] res = cont.members();
+ int size2 = res.length;
+ List list = new ArrayList(size2);
+ for (int j = 0; j < size2; j++) {
+ if (res[j] instanceof IVirtualContainer) {
+ IVirtualContainer cc = (IVirtualContainer) res[j];
+ IFlatFolder mf = addVirtualContainerInternal(cc, path);
+ IFlatResource[] mr = addMembersInternal(current, cc, path.append(cc.getName()));
+ addMembersToModuleFolder(mf, mr);
+ } else {
+ addFile(current, path, (IAdaptable)res[j]);
+ }
+ }
+ FlatResource[] mr = new FlatResource[list.size()];
+ list.toArray(mr);
+ return mr;
+ }
+
+ public void addFile(IVirtualComponent current, IPath path, IAdaptable file) {
+ IFile f = (IFile)file.getAdapter(IFile.class);
+ IFlatFile mf = null;
+ if( f != null )
+ mf = createModuleFile(f, path.makeRelative());
+ else {
+ File f2 = (File)file.getAdapter(File.class);
+ if( f2 != null )
+ mf = new FlatFile(f2, f2.getName(), path.makeRelative());
+ }
+ if( mf != null ) {
+ if (handler == null || handler.shouldAddComponentFile(current, mf)) {
+ if( mf.getModuleRelativePath().isEmpty()) {
+ members.remove(mf);
+ members.add(mf);
+ }
+ else {
+ IFlatFolder moduleParent = VirtualComponentFlattenUtility.ensureParentExists(members, mf.getModuleRelativePath(), null);
+ List tempParentMembers = new ArrayList(Arrays.asList(moduleParent.members()));
+ tempParentMembers.remove(mf);
+ tempParentMembers.add(mf);
+ moduleParent.setMembers((IFlatResource[]) tempParentMembers.toArray(new IFlatResource[tempParentMembers.size()]));
+ }
+ }
+ }
+ }
+
+ public void addFile(IVirtualComponent current, IFile f, IPath path) {
+ addFile(current, path, (IAdaptable)f);
+ }
+
+ protected IFlatFolder addVirtualContainerInternal(IVirtualContainer cc, IPath path) {
+ // Retrieve already existing module folder if applicable
+ IFlatFolder mf = (FlatFolder) getExistingModuleResource(members,path.append(cc.getName()).makeRelative());
+ if (mf == null) {
+ mf = new FlatFolder((IContainer)cc.getUnderlyingResource(), cc.getName(), path);
+ IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
+ if (path.isEmpty())
+ members.add(mf);
+ else {
+ if (parent == null)
+ parent = ensureParentExists(members, path, (IContainer)cc.getUnderlyingResource());
+ addMembersToModuleFolder(parent, new IFlatResource[] {mf});
+ }
+ }
+ return mf;
+ }
+
+ public static FlatFile createModuleFile(final IFile file, final IPath path) {
+ return new FlatFile(file, file.getName(), path);
+ }
+
+
+ /**
+ * Check the current cache to see if we already have an existing module resource for
+ * the given path.
+ * @param aList
+ * @param path
+ * @return an existing moduleResource from the cached result
+ */
+
+ public static FlatResource getExistingModuleResource(List aList, IPath path) {
+ // If the list is empty, return null
+ if (aList==null || aList.isEmpty() || path == null)
+ return null;
+ // Otherwise recursively check to see if given resource matches current resource or if it is a child
+ String[] pathSegments = path.segments();
+ FlatResource exportableResource = null;
+
+ if(pathSegments.length == 0)
+ return null;
+ for (Iterator iter = aList.iterator(); iter.hasNext();) {
+ exportableResource = (FlatResource) iter.next();
+ String[] moduleSegments = exportableResource.getModuleRelativePath().segments();
+ // If the last segment in passed in path equals the module resource name
+ // and segment count is the same and the path segments start with the module path segments
+ // then we have a match and we return the existing moduleResource
+ if (pathSegments[pathSegments.length - 1].equals(exportableResource.getName()) &&
+ (moduleSegments.length + 1) == pathSegments.length &&
+ startsWith(moduleSegments, pathSegments))
+ return exportableResource;
+
+ // Otherwise, if it is a folder, check its children for the existing resource path
+ // but only check if the beginning segments are a match
+ if(exportableResource instanceof FlatFolder &&
+ startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
+ exportableResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))
+ if (((FlatFolder)exportableResource).members()!=null)
+ return getExistingModuleResource(Arrays.asList(((FlatFolder)exportableResource).members()),path);
+ }
+ return null;
+ }
+
+ /**
+ * @return True if beginningSegments[i] == testSegments[i] for all 0<=i<beginningSegments[i]
+ */
+ private static boolean startsWith(String[] beginningSegments, String[] testSegments) {
+ for(int i=0; i < beginningSegments.length; i++) {
+ if(!beginningSegments[i].equals(testSegments[i]))
+ return false;
+ }
+ return true;
+ }
+
+ public static IFlatFolder ensureParentExists(List<IFlatResource> members, IPath path, IContainer cc) {
+ IFlatFolder parent = (IFlatFolder) getExistingModuleResource(members, path);
+ if (parent == null && path.segmentCount() > 0) {
+ String folderName = path.lastSegment();
+ IPath folderPath = Path.EMPTY;
+ if (path.segmentCount()>1)
+ folderPath = path.removeLastSegments(1);
+ parent = new FlatFolder(cc, folderName, folderPath);
+ if (path.segmentCount()>1)
+ addMembersToModuleFolder(ensureParentExists(members, path.removeLastSegments(1),cc), new IFlatResource[] {parent});
+ else
+ members.add(parent);
+ }
+ return parent;
+ }
+
+ /**
+ * Add the resources from mr to the existing resources in Module Folder mf
+ * @param ModuleFolder mf
+ * @param IModuleResource[] mr
+ */
+ public static void addMembersToModuleFolder(IFlatFolder mf, IFlatResource[] mr) {
+ // If the folder is null or the resources to add are null or empty, bail and return
+ if (mf == null || mr == null || mr.length==0)
+ return;
+ // Get the existing members in the module folder
+ IFlatResource[] mf_members = mf.members();
+ int mf_size = 0;
+ // Get the length of the existing members in the module folder
+ if (mf_members != null)
+ mf_size = mf_members.length;
+ // Create a new array to set on the module folder which will combine the existing and
+ // new module resources
+ IFlatResource[] res = new FlatResource[mf_size + mr.length];
+ // Copy the existing members into the array if there are any
+ if (mf_members != null && mf_size > 0)
+ System.arraycopy(mf_members, 0, res, 0, mf_size);
+ // Copy the new members into the array
+ System.arraycopy(mr, 0, res, mf_size, mr.length);
+ // Set the new members array on the module folder
+ mf.setMembers(res);
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
index a2722b6..2739cad 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
@@ -26,6 +26,7 @@
import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
@@ -79,8 +80,8 @@
if(PlatformURLModuleConnection.MODULE.equals(aURI.scheme())) {
try {
normalizedURI = PlatformURLModuleConnection.resolve(aURI);
- } catch(IOException ioe) {
- ioe.printStackTrace();
+ } catch(IOException e) {
+ ModulecorePlugin.logError(e);
}
} else {
normalizedURI = super.normalize(aURI);
@@ -109,7 +110,7 @@
return URI.createPlatformResourceURI(newFile.getWorkspaceRelativePath().toString());
} catch(Exception e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
return null;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
index 9147466..84ea36d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ComponentResourceImpl.java,v 1.3 2006/01/11 18:40:31 cbridgha Exp $
+ * $Id: ComponentResourceImpl.java,v 1.4 2010/05/13 04:04:35 canderson Exp $
*/
package org.eclipse.wst.common.componentcore.internal.impl;
@@ -23,6 +23,7 @@
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil.ESynchronizedAdapterList;
/**
* <!-- begin-user-doc -->
@@ -430,5 +431,15 @@
owningProject = aProject;
}
+ @Override
+ public EList eAdapters()
+ {
+ if (eAdapters == null)
+ {
+ eAdapters = new ESynchronizedAdapterList(this);
+ }
+ return eAdapters;
+ }
+
} //ComponentResourceImpl
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
index 888ba54..c04eedd 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ComponentcorePackageImpl.java,v 1.9 2006/04/27 04:17:40 cbridgha Exp $
+ * $Id: ComponentcorePackageImpl.java,v 1.10 2009/06/09 20:02:04 jsholl Exp $
*/
package org.eclipse.wst.common.componentcore.internal.impl;
@@ -567,51 +567,51 @@
// Add supertypes to classes
// Initialize classes and features; add operations and parameters
- initEClass(workbenchComponentEClass, WorkbenchComponent.class, "WorkbenchComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getWorkbenchComponent_Name(), ecorePackage.getEString(), "name", "", 1, 1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkbenchComponent_Resources(), this.getComponentResource(), this.getComponentResource_Component(), "resources", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkbenchComponent_ComponentType(), this.getComponentType(), null, "componentType", null, 1, 1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkbenchComponent_ReferencedComponents(), this.getReferencedComponent(), null, "referencedComponents", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkbenchComponent_Properties(), this.getProperty(), null, "properties", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWorkbenchComponent_MetadataResources(), this.getIPath(), "metadataResources", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(workbenchComponentEClass, WorkbenchComponent.class, "WorkbenchComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWorkbenchComponent_Name(), ecorePackage.getEString(), "name", "", 1, 1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWorkbenchComponent_Resources(), this.getComponentResource(), this.getComponentResource_Component(), "resources", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWorkbenchComponent_ComponentType(), this.getComponentType(), null, "componentType", null, 1, 1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWorkbenchComponent_ReferencedComponents(), this.getReferencedComponent(), null, "referencedComponents", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWorkbenchComponent_Properties(), this.getProperty(), null, "properties", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWorkbenchComponent_MetadataResources(), this.getIPath(), "metadataResources", null, 0, -1, WorkbenchComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEClass(componentResourceEClass, ComponentResource.class, "ComponentResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getComponentResource_SourcePath(), this.getIPath(), "sourcePath", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getComponentResource_RuntimePath(), this.getIPath(), "runtimePath", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getComponentResource_Exclusions(), ecorePackage.getEString(), "exclusions", "", 0, -1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getComponentResource_Component(), this.getWorkbenchComponent(), this.getWorkbenchComponent_Resources(), "component", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getComponentResource_ResourceType(), ecorePackage.getEString(), "resourceType", "", 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(componentResourceEClass, ComponentResource.class, "ComponentResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getComponentResource_SourcePath(), this.getIPath(), "sourcePath", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getComponentResource_RuntimePath(), this.getIPath(), "runtimePath", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getComponentResource_Exclusions(), ecorePackage.getEString(), "exclusions", "", 0, -1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getComponentResource_Component(), this.getWorkbenchComponent(), this.getWorkbenchComponent_Resources(), "component", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getComponentResource_ResourceType(), ecorePackage.getEString(), "resourceType", "", 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEClass(componentTypeEClass, ComponentType.class, "ComponentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getComponentType_ComponentTypeId(), ecorePackage.getEString(), "componentTypeId", "", 1, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getComponentType_Version(), ecorePackage.getEString(), "version", "", 1, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getComponentType_Properties(), this.getProperty(), null, "properties", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getComponentType_MetadataResources(), this.getIPath(), "metadataResources", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(componentTypeEClass, ComponentType.class, "ComponentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getComponentType_ComponentTypeId(), ecorePackage.getEString(), "componentTypeId", "", 1, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getComponentType_Version(), ecorePackage.getEString(), "version", "", 1, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getComponentType_Properties(), this.getProperty(), null, "properties", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getComponentType_MetadataResources(), this.getIPath(), "metadataResources", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getProperty_Name(), ecorePackage.getEString(), "name", "", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProperty_Value(), ecorePackage.getEString(), "value", "", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProperty_Name(), ecorePackage.getEString(), "name", "", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getProperty_Value(), ecorePackage.getEString(), "value", "", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(referencedComponentEClass, ReferencedComponent.class, "ReferencedComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getReferencedComponent_Handle(), this.getURI(), "handle", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getReferencedComponent_RuntimePath(), this.getIPath(), "runtimePath", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getReferencedComponent_DependencyType(), this.getDependencyType(), "dependencyType", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getReferencedComponent_DependentObject(), ecorePackage.getEObject(), null, "dependentObject", null, 0, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getReferencedComponent_ArchiveName(), ecorePackage.getEString(), "archiveName", null, 0, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getReferencedComponent_Handle(), this.getURI(), "handle", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getReferencedComponent_RuntimePath(), this.getIPath(), "runtimePath", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getReferencedComponent_DependencyType(), this.getDependencyType(), "dependencyType", null, 1, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getReferencedComponent_DependentObject(), ecorePackage.getEObject(), null, "dependentObject", null, 0, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getReferencedComponent_ArchiveName(), ecorePackage.getEString(), "archiveName", null, 0, 1, ReferencedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEClass(projectComponentsEClass, ProjectComponents.class, "ProjectComponents", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getProjectComponents_ProjectName(), ecorePackage.getEString(), "projectName", "", 1, 1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProjectComponents_Components(), this.getWorkbenchComponent(), null, "components", null, 0, -1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProjectComponents_Version(), ecorePackage.getEString(), "version", null, 1, 1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(projectComponentsEClass, ProjectComponents.class, "ProjectComponents", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getProjectComponents_ProjectName(), ecorePackage.getEString(), "projectName", "", 1, 1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getProjectComponents_Components(), this.getWorkbenchComponent(), null, "components", null, 0, -1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getProjectComponents_Version(), ecorePackage.getEString(), "version", null, 1, 1, ProjectComponents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
// Initialize enums and add enum literals
- initEEnum(dependencyTypeEEnum, DependencyType.class, "DependencyType");
+ initEEnum(dependencyTypeEEnum, DependencyType.class, "DependencyType"); //$NON-NLS-1$
addEEnumLiteral(dependencyTypeEEnum, DependencyType.USES_LITERAL);
addEEnumLiteral(dependencyTypeEEnum, DependencyType.CONSUMES_LITERAL);
// Initialize data types
- initEDataType(iPathEDataType, IPath.class, "IPath", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+ initEDataType(iPathEDataType, IPath.class, "IPath", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
index 170c513..1076676 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
@@ -200,7 +200,7 @@
if (aComponent.isBinary())
return ModuleURIUtil.archiveComponentfullyQualifyURI(aComponent.getName()).toString();
else
- return "[" + aComponent.getProject().getFullPath() + "]:" + aComponent.getProject().getName();
+ return "[" + aComponent.getProject().getFullPath() + "]:" + aComponent.getProject().getName(); //$NON-NLS-1$ //$NON-NLS-2$
}
public static String getContentTypeName(URI uri) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceFactory.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceFactory.java
index 2a157ad..55d2299 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceFactory.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceFactory.java
@@ -19,7 +19,6 @@
public ReferencedComponentXMIResourceFactory() {
super();
- // TODO Auto-generated constructor stub
}
/**
* This is the method that subclasses can override to actually instantiate a new Resource
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceImpl.java
index 333b4b0..ac46885 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentXMIResourceImpl.java
@@ -20,12 +20,10 @@
public ReferencedComponentXMIResourceImpl() {
super();
- // TODO Auto-generated constructor stub
}
public ReferencedComponentXMIResourceImpl(URI uri) {
super(uri);
- // TODO Auto-generated constructor stub
}
protected MappedXMIHelper doCreateXMLHelper() {
return new MappedComponentXMIHelper(this, getPrefixToPackageURIs());
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
index ecdb100..71fda2c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
@@ -12,8 +12,10 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -31,6 +33,7 @@
import org.eclipse.core.runtime.jobs.ILock;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.Resource.Factory;
import org.eclipse.jem.util.RegistryReader;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
@@ -432,7 +435,7 @@
return URI.createPlatformResourceURI(newFile.getWorkspaceRelativePath().toString());
} catch(Exception e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
return null;
}
@@ -453,8 +456,7 @@
try {
description = file.getContentDescription();
} catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
}
if (description == null) {//Check for optional embedded uri segment, then normalize
@@ -465,15 +467,13 @@
try {
componentProject = StructureEdit.getContainingProject(uri);
} catch (UnresolveableURIException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
uri = PlatformURLModuleConnection.resolve(uri);
uri = newPlatformURI(uri,componentProject);
}
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
}
@@ -486,4 +486,30 @@
return super.getDescriptor(uri);
}
}
+
+ public Factory getFactory(URI uri, String contentType) {
+ IContentType type = Platform.getContentTypeManager().getContentType(contentType);
+ if (type != null)
+ return getFactory(uri, type.getDefaultDescription());
+ return super.getFactory(uri, contentType);
+ }
+
+
+ /**
+ * Returns true if the uri is found in the WTPResourceFactoryRegistry descriptor.
+ * This will not load any extension points
+ */
+ public synchronized boolean shortNameRegistered(URI uri) {
+ Map m = getDescriptors();
+ Collection c = m.values();
+ Iterator iter = c.iterator();
+ String uriLastSegment = uri.lastSegment();
+ while(iter.hasNext()) {
+ ResourceFactoryDescriptor descriptor = (ResourceFactoryDescriptor) iter.next();
+ if(descriptor.getShortSegment() != null && descriptor.getShortSegment().equals(uriLastSegment)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
index 883ebb9..c8b183a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
@@ -1,9 +1,13 @@
-/**
- * <copyright>
- * </copyright>
+/*******************************************************************************
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
*
- * $Id: WorkbenchComponentImpl.java,v 1.14 2007/02/14 16:00:52 jsholl Exp $
- */
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
package org.eclipse.wst.common.componentcore.internal.impl;
import java.util.Collection;
@@ -60,7 +64,12 @@
public static class ESynchronizedAdapterList extends EAdapterList
{
- public ESynchronizedAdapterList(Notifier notifier) {
+ @Override
+ public Object[] data() {
+ synchronized (this){return super.data();}
+ }
+
+ public ESynchronizedAdapterList(Notifier notifier) {
super(notifier);
}
@@ -552,6 +561,13 @@
public void eNotify(Notification notification) {
synchronized (eAdapters()) {
super.eNotify(notification);
+ switch(notification.getEventType()) {
+ case Notification.REMOVE:
+ case Notification.REMOVE_MANY:
+ defaultSourceRoot = null;
+ handle = null;
+ break;
+ }
}
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java
new file mode 100644
index 0000000..40c6e65
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.common.componentcore.internal.operation;
+
+import java.util.Set;
+
+import org.eclipse.wst.common.componentcore.datamodel.properties.IAddReferenceDataModelProperties;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+
+/**
+ * This class is meant to be an alternative to CreateReferenceComponentsDataModelProvider
+ * which requires less options and allows for a pre-made IVirtualReference to be stored.
+ */
+public class AddReferenceDataModelProvider extends AbstractDataModelProvider implements IAddReferenceDataModelProperties {
+
+ public AddReferenceDataModelProvider() {
+ super();
+ }
+
+ public Set getPropertyNames() {
+ Set propertyNames = super.getPropertyNames();
+ propertyNames.add(SOURCE_COMPONENT);
+ propertyNames.add(TARGET_REFERENCE_LIST);
+ return propertyNames;
+ }
+
+ public IDataModelOperation getDefaultOperation() {
+ return new AddReferencesOp(model);
+ }
+
+ public Object getDefaultProperty(String propertyName) {
+ // No defaults, both must be set
+ return super.getDefaultProperty(propertyName);
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java
new file mode 100644
index 0000000..35812bf
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * 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.common.componentcore.internal.operation;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jem.util.UIContextDetermination;
+import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IAddReferenceDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext;
+
+public class AddReferencesOp extends AbstractDataModelOperation {
+
+
+ public AddReferencesOp(IDataModel model) {
+ super(model);
+ }
+
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if (!validateEdit().isOK())
+ return Status.CANCEL_STATUS;
+ addReferencedComponents(monitor);
+ addProjectReferences();
+ return OK_STATUS;
+ }
+
+ /**
+ * Validate edit for resource state
+ */
+ protected IStatus validateEdit() {
+ IStatus status = OK_STATUS;
+ IValidateEditContext validator = (IValidateEditContext) UIContextDetermination.createInstance(IValidateEditContext.CLASS_KEY);
+ IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT);
+ IProject project = sourceComp.getProject();
+
+ if (status.isOK()) {
+ StructureEdit sEdit = null;
+ try {
+ sEdit = StructureEdit.getStructureEditForWrite(project);
+ status = validator.validateState(sEdit.getModuleStructuralModel());
+ } finally {
+ if (sEdit !=null)
+ sEdit.dispose();
+ }
+ }
+
+ IFile [] files = new IFile[1];
+ files[0] = project.getFile(ProjectUtilities.DOT_PROJECT);
+ status = ResourcesPlugin.getWorkspace().validateEdit(files, null);
+ return status;
+ }
+
+ public static List<IVirtualReference> getListFromModel(IDataModel model) {
+ Object value = model.getProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST);
+ List<IVirtualReference> modList = value instanceof List ? (List<IVirtualReference>)value : Arrays.asList(new IVirtualReference[]{(IVirtualReference)value});
+ return modList;
+ }
+
+ protected void addProjectReferences() {
+
+ IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT);
+ List modList = getListFromModel(model);
+ List targetprojectList = new ArrayList();
+ for (int i = 0; i < modList.size(); i++) {
+ IVirtualComponent virtualComponent = ((IVirtualReference) modList.get(i)).getReferencedComponent();
+ if(virtualComponent.isBinary()){
+ continue;
+ }
+ IProject targetProject = virtualComponent.getProject();
+ targetprojectList.add(targetProject);
+ }
+ try {
+ ProjectUtilities.addReferenceProjects(sourceComp.getProject(), targetprojectList);
+ } catch (CoreException e) {
+ ModulecorePlugin.logError(e);
+ }
+
+ }
+
+ protected void addReferencedComponents(IProgressMonitor monitor) {
+ IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT);
+ List<IVirtualReference> refList = getListFromModel(model);
+ IVirtualReference[] refs = (IVirtualReference[]) refList.toArray(new IVirtualReference[refList.size()]);
+ sourceComp.addReferences(refs);
+ }
+
+ public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ return null;
+ }
+
+ public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ return null;
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
index b956516..b0a46d3 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
@@ -40,7 +40,6 @@
public ArtifactEditProviderOperation() {
super();
- // TODO Auto-generated constructor stub
}
public ArtifactEditProviderOperation(IDataModel model) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
index dfcc622..9fcc768 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
@@ -29,6 +29,7 @@
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -83,14 +84,17 @@
List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
List targetprojectList = new ArrayList();
for (int i = 0; i < modList.size(); i++) {
- IVirtualComponent IVirtualComponent = (IVirtualComponent) modList.get(i);
- IProject targetProject = IVirtualComponent.getProject();
+ IVirtualComponent virtualComponent = (IVirtualComponent) modList.get(i);
+ if(virtualComponent.isBinary()){
+ continue;
+ }
+ IProject targetProject = virtualComponent.getProject();
targetprojectList.add(targetProject);
}
try {
ProjectUtilities.addReferenceProjects(sourceComp.getProject(), targetprojectList);
} catch (CoreException e) {
- e.printStackTrace();
+ ModulecorePlugin.logError(e);
}
}
@@ -106,6 +110,8 @@
if (deployPathStr != null && deployPathStr.length() > 0){
deployPath = new Path(deployPathStr);
}
+ else if (deployPathStr.length() == 0) deployPath = new Path("/"); //$NON-NLS-1$);
+
for (int i = 0; i < modList.size(); i++) {
IVirtualComponent comp = (IVirtualComponent) modList.get(i);
if (!srcComponentContainsReference(sourceComp, comp, deployPath)) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetDataModelOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetDataModelOperation.java
index 1558b11..71d4dc1 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetDataModelOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetDataModelOperation.java
@@ -10,22 +10,29 @@
*******************************************************************************/
package org.eclipse.wst.common.componentcore.internal.operation;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
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.common.project.facet.core.IFacetedProject.Action.Type;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
public class FacetDataModelOperation extends AbstractDataModelOperation {
@@ -36,7 +43,7 @@
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IFacetedProject facetProj;
try {
- facetProj = ProjectFacetsManager.create(model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME), null, monitor);
+ facetProj = createProject(monitor);
Set actions = new HashSet();
actions.add(new IFacetedProject.Action((Type) model.getProperty(IFacetDataModelProperties.FACET_TYPE), (IProjectFacetVersion) model.getProperty(IFacetDataModelProperties.FACET_VERSION), model));
facetProj.modify(actions, monitor);
@@ -46,4 +53,29 @@
return OK_STATUS;
}
+ public IFacetedProject createProject(IProgressMonitor monitor) throws CoreException {
+ IProject project = ProjectUtilities.getProject((String) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME));
+ IFacetedProject facetProj = null;
+
+ if (project.exists()) {
+ facetProj = ProjectFacetsManager.create(project, true, monitor);
+ } else {
+ String location = null;
+ if (model.isProperty(IProjectCreationPropertiesNew.PROJECT_LOCATION))
+ {
+ location = (String) model.getProperty(IProjectCreationPropertiesNew.PROJECT_LOCATION);
+ }
+ IPath locationPath = null == location ? null : new Path(location);
+ facetProj = ProjectFacetsManager.create(model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME), locationPath, monitor);
+ }
+ if (model.isProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME))
+ {
+ IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+ IRuntime existingRuntime = facetProj.getPrimaryRuntime();
+ if (runtime != null && (existingRuntime == null || !runtime.equals(existingRuntime))) {
+ facetProj.setTargetedRuntimes(Collections.singleton(runtime), null);
+ }
+ }
+ return facetProj;
+ }
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
index abdcd14..c85ad06 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
@@ -25,9 +25,9 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
@@ -106,10 +106,10 @@
}
} catch (CoreException e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
throw new ExecutionException(e.getMessage(), e);
} catch (Exception e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
}
return OK_STATUS;
}
@@ -127,7 +127,7 @@
if (!actions.isEmpty())
facetProj.modify(actions, null);
} catch (CoreException e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
}
}
@@ -153,9 +153,16 @@
public static void addDefaultFactets(IFacetedProject facetProj, IRuntime runtime) throws ExecutionException {
if (runtime != null) {
- final IFacetedProjectWorkingCopy fpjwc = facetProj.createWorkingCopy();
- Set<IProjectFacetVersion> presetFacets = fpjwc.getDefaultConfiguration().getProjectFacets();
- addDefaultFacets(facetProj, presetFacets);
+ IFacetedProjectWorkingCopy fpjwc = null;
+ try{
+ fpjwc = facetProj.createWorkingCopy();
+ Set<IProjectFacetVersion> presetFacets = fpjwc.getDefaultConfiguration().getProjectFacets();
+ addDefaultFacets(facetProj, presetFacets);
+ } finally{
+ if(fpjwc != null){
+ fpjwc.dispose();
+ }
+ }
}
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
index d507389..9587406 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
@@ -22,6 +22,12 @@
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+/**
+ * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+ * @deprecated
+ * @author jsholl
+ */
public class ProjectMigratorDataModelOperation extends AbstractDataModelOperation {
public ProjectMigratorDataModelOperation(IDataModel model) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
index bb1f2c3..d0ed549 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
@@ -22,8 +22,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -60,11 +60,16 @@
existingReferences.add(existingReferencesArray[i]);
}
- String deployPath = model.getStringProperty( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH );
- IPath path = new Path( deployPath );
+ IPath path = null;
+ //if the deployPath is not explicitly set, then leave it as null so the first reference is removed.
+ if(model.isPropertySet( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH )){
+ String deployPath = model.getStringProperty( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH );
+ path = new Path( deployPath );
+ }
List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
+
List targetprojectList = new ArrayList();
for (int i = 0; i < modList.size() && !existingReferences.isEmpty(); i++) {
@@ -90,7 +95,7 @@
try {
ProjectUtilities.removeReferenceProjects(sourceComp.getProject(),targetprojectList);
} catch (CoreException e) {
- Logger.getLogger().logError(e);
+ ModulecorePlugin.logError(e);
}
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceDataModelProvider.java
new file mode 100644
index 0000000..58086c4
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceDataModelProvider.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.operation;
+
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+
+/**
+ * This class is meant to be an alternative to RemoveReferenceComponentsDataModelProvider
+ * in order to remove pre-made or pre-crafted IVirtualReferences, rather than
+ * searching for their individual properties
+ */
+public class RemoveReferenceDataModelProvider extends AddReferenceDataModelProvider {
+
+ public RemoveReferenceDataModelProvider() {
+ super();
+ }
+
+ public IDataModelOperation getDefaultOperation() {
+ return new RemoveReferenceOperation(model);
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java
new file mode 100644
index 0000000..fcc3b1a
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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.operation;
+
+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.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IAddReferenceDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+
+/**
+ * This class is meant to be an alternative to RemoveReferenceComponentOperation
+ * in order to remove pre-made or pre-crafted IVirtualReferences, rather than
+ * searching for their individual properties
+ */
+public class RemoveReferenceOperation extends AbstractDataModelOperation {
+
+ public RemoveReferenceOperation() {
+ super();
+ }
+
+ public RemoveReferenceOperation(IDataModel model) {
+ super(model);
+ }
+
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ removeReferences(monitor);
+ return OK_STATUS;
+ }
+
+ protected List<IVirtualReference> getListFromModel(IDataModel model) {
+ Object value = model.getProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST);
+ List<IVirtualReference> modList = value instanceof List ? (List<IVirtualReference>)value : Arrays.asList(new IVirtualReference[]{(IVirtualReference)value});
+ return modList;
+ }
+
+ protected void removeReferences(IProgressMonitor monitor) {
+
+ IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT);
+ if (sourceComp == null || !sourceComp.getProject().isAccessible() || sourceComp.isBinary()) return;
+
+ IVirtualReference [] existingReferencesArray = sourceComp.getReferences();
+ if(existingReferencesArray == null || existingReferencesArray.length == 0){
+ return;
+ }
+
+ List<IVirtualReference> existingReferences = new ArrayList<IVirtualReference>();
+ existingReferences.addAll(Arrays.asList(existingReferencesArray));
+ List<IVirtualReference> modList = getListFromModel(model);
+ List targetprojectList = new ArrayList();
+ for (int i = 0; i < modList.size() && !existingReferences.isEmpty(); i++) {
+ IVirtualReference ref = modList.get(i);
+ if (ref.getReferencedComponent()==null )
+ continue;
+
+ IVirtualReference existing = findMatchingReference(existingReferences,
+ ref.getReferencedComponent(), ref.getRuntimePath());
+ //if a ref was found matching the specified deployPath, then remove it
+ if(existing != null){
+ removeRefereneceInComponent(sourceComp, existing);
+ existingReferences.remove(existing);
+ //after removing the ref, check to see if it was the last ref removed to that component
+ //and if it was, then also remove the project reference
+ existing = findMatchingReference(existingReferences, ref.getReferencedComponent());
+ if(existing == null){
+ IProject targetProject = ref.getReferencedComponent().getProject();
+ targetprojectList.add(targetProject);
+ }
+ }
+ }
+
+ try {
+ ProjectUtilities.removeReferenceProjects(sourceComp.getProject(),targetprojectList);
+ } catch (CoreException e) {
+ ModulecorePlugin.logError(e);
+ }
+
+ }
+
+ private IVirtualReference findMatchingReference(List existingReferences, IVirtualComponent comp, IPath path) {
+ for(int i=0;i<existingReferences.size(); i++){
+ IVirtualReference ref = (IVirtualReference)existingReferences.get(i);
+ IVirtualComponent c = ref.getReferencedComponent();
+ if(c != null && c.getName().equals(comp.getName())){
+ if(path == null){
+ return ref;
+ } else if(path.equals(ref.getRuntimePath())){
+ return ref;
+ }
+ }
+ }
+ return null;
+ }
+
+ private IVirtualReference findMatchingReference(List existingReferences, IVirtualComponent comp) {
+ return findMatchingReference(existingReferences, comp, null);
+ }
+
+ protected void removeRefereneceInComponent(IVirtualComponent component, IVirtualReference reference) {
+ ((VirtualComponent)component.getComponent()).removeReference(reference);
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java
new file mode 100644
index 0000000..838187d
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/AbstractResourceListVirtualComponent.java
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.resources;
+
+import java.util.Map;
+import java.util.Properties;
+
+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.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+public abstract class AbstractResourceListVirtualComponent implements IVirtualComponent {
+ protected IProject project;
+ protected IVirtualComponent referencingComp;
+
+ public AbstractResourceListVirtualComponent(IProject p, IVirtualComponent referencingComponent) {
+ this.project = p;
+ this.referencingComp = referencingComponent;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if(this == o){
+ return true;
+ }
+ if(o == null){
+ return false;
+ }
+ if(!this.getClass().equals(o.getClass())){
+ return false;
+ }
+ AbstractResourceListVirtualComponent other = (AbstractResourceListVirtualComponent)o;
+ return (project == null ? other.project == null : project.equals(other.project)) &&
+ (referencingComp == null ? other.referencingComp == null : referencingComp.equals(other.referencingComp));
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode() + (project == null ? 0 : project.hashCode()) + (referencingComp == null ? 0 : referencingComp.hashCode());
+ }
+
+
+ public void create(int updateFlags, IProgressMonitor aMonitor)
+ throws CoreException {
+ // Ignore
+ }
+
+ public boolean exists() {
+ return true;
+ }
+
+ public IVirtualComponent getComponent() {
+ return this;
+ }
+
+ public String getName() {
+ return getId();
+ }
+
+ public String getDeployedName() {
+ return getName();
+ }
+
+ public String getId() {
+ String firstSegment = getFirstIdSegment();
+ if (project != null && project.equals(
+ referencingComp.getProject()))
+ return firstSegment;
+ return firstSegment + Path.SEPARATOR + project.getName();
+ }
+
+ protected abstract String getFirstIdSegment();
+
+ public IProject getProject() {
+ return project;
+ }
+
+ public IVirtualComponent[] getReferencingComponents() {
+ return referencingComp == null ? new IVirtualComponent[] {}
+ : new IVirtualComponent[] { referencingComp };
+ }
+
+ public IVirtualFolder getRootFolder() {
+ // Creates a new instance each time to ensure it's not cached
+ IContainer[] containers = getUnderlyingContainers();
+ IResource[] looseResources = getLooseResources();
+ ResourceListVirtualFolder folder =
+ new ResourceListVirtualFolder(project, new Path("/"), containers, looseResources); //$NON-NLS-1$
+ return folder;
+ }
+
+ protected abstract IContainer[] getUnderlyingContainers();
+ protected abstract IResource[] getLooseResources();
+
+ public Properties getMetaProperties() {
+ return null;
+ }
+
+ public IPath[] getMetaResources() {
+ return null;
+ }
+
+ public IVirtualReference getReference(String aComponentName) {
+ // Ignore
+ return null;
+ }
+
+ public IVirtualReference[] getReferences() {
+ // Ignore; no children
+ return new IVirtualReference[] {};
+ }
+
+ public IVirtualReference[] getReferences(Map<String, Object> options) {
+ // Ignore, no children
+ return new IVirtualReference[]{};
+ }
+
+
+ public boolean isBinary() {
+ return false;
+ }
+
+ public void setMetaProperties(Properties properties) {
+ // Ignore
+ }
+
+ public void setMetaProperty(String name, String value) {
+ // Ignore
+ }
+
+ public void setMetaResources(IPath[] theMetaResourcePaths) {
+ // Ignore
+ }
+
+ public void setReferences(IVirtualReference[] theReferences) {
+ // Ignore
+ }
+
+ public Object getAdapter(Class adapter) {
+ // Ignore
+ return null;
+ }
+
+ public void addReferences(IVirtualReference[] references) {
+ // Ignore
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java
new file mode 100644
index 0000000..11d89f3
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/ResourceListVirtualFolder.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.resources;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
+
+public class ResourceListVirtualFolder extends VirtualFolder {
+
+ public interface ResourceFilter {
+ public boolean accepts(IResource resource);
+ }
+
+ private ArrayList<IResource> children;
+ private ArrayList<IContainer> underlying;
+ private ResourceFilter filter;
+ public ResourceListVirtualFolder(
+ IProject aComponentProject,
+ IPath aRuntimePath) {
+ super(aComponentProject, aRuntimePath);
+ this.children = new ArrayList<IResource>();
+ this.underlying = new ArrayList<IContainer>();
+ }
+
+ public ResourceListVirtualFolder(
+ IProject aComponentProject,
+ IPath aRuntimePath, IContainer[] underlyingContainers) {
+ this(aComponentProject, aRuntimePath);
+ addUnderlyingResource(underlyingContainers);
+ }
+
+ public ResourceListVirtualFolder(
+ IProject aComponentProject,
+ IPath aRuntimePath, IContainer[] underlyingContainers,
+ IResource[] looseResources) {
+ this(aComponentProject, aRuntimePath, underlyingContainers);
+ addChildren(looseResources);
+ }
+
+ public void setFilter(ResourceFilter filter) {
+ this.filter = filter;
+ }
+
+ protected void addUnderlyingResource(IResource resource) {
+ if( resource instanceof IContainer ) {
+ underlying.add((IContainer)resource);
+ try {
+ IResource[] newChildren = ((IContainer)resource).members();
+ for( int i = 0; i < newChildren.length; i++ ) {
+ children.add(newChildren[i]);
+ }
+ } catch( CoreException ce) {
+ // TODO log
+ }
+ }
+ }
+
+ protected void addUnderlyingResource(IResource[] resources) {
+ for( int i = 0; i < resources.length; i++ ) {
+ addUnderlyingResource(resources[i]);
+ }
+ }
+
+ protected void addChild(IResource resource) {
+ this.children.add(resource);
+ }
+
+ protected void addChildren(IResource[] resources) {
+ this.children.addAll(Arrays.asList(resources));
+ }
+
+ @Override
+ public IResource getUnderlyingResource() {
+ return getUnderlyingFolder();
+ }
+
+ @Override
+ public IResource[] getUnderlyingResources() {
+ return getUnderlyingFolders();
+ }
+
+ @Override
+ public IContainer getUnderlyingFolder() {
+ return underlying.size() > 0 ? underlying.get(0) : null;
+ }
+
+ @Override
+ public IContainer[] getUnderlyingFolders() {
+ return underlying.toArray(new IContainer[underlying.size()]);
+ }
+
+ @Override
+ public IVirtualResource[] members(int memberFlags) throws CoreException {
+ HashMap<String, IVirtualResource> virtualResources = new HashMap<String, IVirtualResource>(); // result
+ IResource[] resources = this.children.toArray(new IResource[this.children.size()]);
+ for( int i = 0; i < resources.length; i++ ) {
+ handleResource(resources[i], virtualResources, memberFlags);
+ }
+ Collection c = virtualResources.values();
+ return (IVirtualResource[]) c.toArray(new IVirtualResource[c.size()]);
+ }
+
+ protected void handleResource(IResource resource, HashMap<String, IVirtualResource> map, int memberFlags) throws CoreException {
+ if( filter != null && !filter.accepts(resource))
+ return;
+
+ if( resource instanceof IFile ) {
+ if( !map.containsKey(resource.getName()) ) {
+ IVirtualFile virtFile = new VirtualFile(getProject(),
+ getRuntimePath().append(((IFile)resource).getName()), (IFile)resource);
+ map.put(resource.getName(), virtFile);
+ return;
+ }
+ }// end file
+ else if( resource instanceof IContainer ) {
+ IContainer realContainer = (IContainer) resource;
+ //IResource[] realChildResources = realContainer.members(memberFlags);
+ IVirtualResource previousValue = map.get(resource.getName());
+ if( previousValue != null && previousValue instanceof ResourceListVirtualFolder ) {
+ ((ResourceListVirtualFolder)previousValue).addUnderlyingResource(realContainer);
+ } else if( previousValue == null ) {
+ ResourceListVirtualFolder childFolder =
+ new ResourceListVirtualFolder(getProject(), getRuntimePath().append(resource.getName()));
+ childFolder.addUnderlyingResource(realContainer);
+ if( filter != null )
+ childFolder.setFilter(filter);
+ map.put(resource.getName(), childFolder);
+ }
+ } // end container
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
index 0d66c2f..0590619 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
@@ -12,6 +12,7 @@
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
@@ -42,18 +43,12 @@
private static final IVirtualReference[] NO_REFERENCES = new VirtualReference[0];
private static final IVirtualComponent[] NO_COMPONENTS = new VirtualComponent[0];
-// private static final IResource[] NO_RESOURCES = null;
private static final IVirtualResource[] NO_VIRTUAL_RESOURCES = null;
private static final Properties NO_PROPERTIES = new Properties();
private static final IPath[] NO_PATHS = new Path[0];
-// private IPath runtimePath;
+ private IPath runtimePath;
private IProject componentProject;
-// private IVirtualFolder rootFolder;
- private int flag = 1;
-// private String archiveLocation;
-
-
private IPath archivePath;
private String archiveType;
@@ -64,10 +59,10 @@
throw new NullPointerException();
}
componentProject = aComponentProject;
-// runtimePath = aRuntimePath;
+ runtimePath = aRuntimePath;
String archivePathString = archiveLocation.substring(4, archiveLocation.length());
- archiveType = archiveLocation.substring(0, archiveLocation.length() - archivePathString.length() -1);
+ archiveType = archiveLocation.substring(0, 3);
archivePath = new Path(archivePathString);
}
@@ -81,6 +76,7 @@
public String getDeployedName() {
return getName();
+ //return getArchivePath().lastSegment();
}
public void setComponentTypeId(String aComponentTypeId) {
@@ -92,8 +88,8 @@
}
public boolean isBinary() {
- boolean ret = (flag & BINARY) == 1 ? true : false;
- return ret;
+ int x = BINARY;
+ return true;
}
public IPath[] getMetaResources() {
@@ -108,10 +104,22 @@
}
+ /**
+ * The implementation should be protected. Deprecated as of WTP 3.2
+ * You should convert to a File or IFile and then get the extension.
+ * @return
+ */
+ @Deprecated
public String getFileExtension() {
return archivePath.getFileExtension();
}
+ /**
+ * The implementation should be protected. Deprecated as of WTP 3.2
+ * You should convert to an IFile and get it's full path
+ * @return
+ */
+ @Deprecated
public IPath getWorkspaceRelativePath() {
if( archivePath.segmentCount() > 1 ){
IFile aFile = ResourcesPlugin.getWorkspace().getRoot().getFile(archivePath);
@@ -121,6 +129,12 @@
return null;
}
+ /**
+ * The implementation should be protected. Deprecated as of WTP 3.2
+ * You should convert to an IFile and use IFile.getProjectRelativePath()
+ * @return
+ */
+ @Deprecated
public IPath getProjectRelativePath() {
IFile aFile = ResourcesPlugin.getWorkspace().getRoot().getFile(getWorkspaceRelativePath());
if (aFile.exists())
@@ -133,9 +147,13 @@
}
public IPath getRuntimePath() {
- return ROOT;
+ return runtimePath == null ? ROOT : runtimePath;
}
+ public IPath getArchivePath() {
+ return archivePath;
+ }
+
public boolean isAccessible() {
return true;
}
@@ -151,6 +169,10 @@
public void create(int updateFlags, IProgressMonitor aMonitor) throws CoreException {
}
+
+ public IVirtualReference[] getReferences(Map<String, Object> options) {
+ return NO_REFERENCES;
+ }
public IVirtualReference[] getReferences() {
return NO_REFERENCES;
@@ -169,17 +191,8 @@
}
public boolean exists() {
- boolean exists = false;
- java.io.File diskFile = getUnderlyingDiskFile();
- if( diskFile != null )
- exists = diskFile.exists();
-
- if( !exists ){
- IFile utilityJar = getUnderlyingWorkbenchFile();
- if( utilityJar != null )
- exists = utilityJar.exists();
- }
- return exists;
+ File f = (File)getAdapter(File.class);
+ return f != null && f.exists();
}
public IVirtualFolder getRootFolder() {
@@ -191,7 +204,26 @@
}
+ /**
+ * Guaranteed accepted adapters and behaviours:
+ * org.eclipse.core.runtime.IPath - if a workspace file, returns ifile.getFullPath(), else new Path(java.io.File.getAbsolutePath())
+ * java.io.File - the file, whether in workspace or out, this will get the actual file if there is one
+ * org.eclipse.core.resources.IFile - the workspace file, if it exists
+ */
public Object getAdapter(Class adapterType) {
+ if( File.class.equals(adapterType))
+ return getUnderlyingDiskFile();
+ if( IFile.class.equals(adapterType)) {
+ return getUnderlyingWorkbenchFile();
+ }
+ if( IPath.class.equals(adapterType)) {
+ IFile f = getUnderlyingWorkbenchFile();
+ if( f != null )
+ return f.getFullPath();
+ File f2 = getUnderlyingDiskFile();
+ if( f2 != null )
+ return new Path(f2.getAbsolutePath());
+ }
return Platform.getAdapterManager().getAdapter(this, adapterType);
}
@@ -224,12 +256,25 @@
public void setMetaProperties(Properties properties) {
}
+
+ /**
+ * The implementation should be protected
+ * You should use getAdapter(IFile.class)
+ * @return
+ */
+ @Deprecated
public IFile getUnderlyingWorkbenchFile() {
if (getWorkspaceRelativePath()==null)
return null;
return ResourcesPlugin.getWorkspace().getRoot().getFile(getWorkspaceRelativePath());
}
+ /**
+ * The implementation should be protected
+ * You should use getAdapter(File.class)
+ * @return
+ */
+ @Deprecated
public File getUnderlyingDiskFile() {
String osPath = null;
IPath loc = null;
@@ -266,5 +311,5 @@
}
return super.toString();
}
-
+
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
index 104db30..a1f8fbd 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
@@ -12,10 +12,13 @@
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -24,18 +27,22 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.Property;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
+import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
+import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
+import org.eclipse.wst.common.componentcore.resolvers.ReferenceResolverUtil;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -50,7 +57,82 @@
String componentTypeId;
private int flag = 0;
+ // Cache variables
+ String name = null;
+ String deploymentName = null;
+ Map <String, IVirtualReference> referenceMap = null;
+ IVirtualReference[] rawReferencesArray = null;
+ IVirtualReference[] referencesArray = null;
+ Properties metaProperties = null;
+ IPath[] cacheMetaResources = null;
+ IVirtualReference[] allReferences = null;
+
+ Resource projectResource;
+ protected ResourceAdapter resourceAdapter = new ResourceAdapter();
+
+ protected class ResourceAdapter extends AdapterImpl {
+ public void notifyChanged(Notification notification) {
+ if (notification.getFeatureID(null) == Resource.RESOURCE__IS_MODIFIED)
+ resourceChanged((Resource) notification.getNotifier());
+ }
+ @Override
+ public boolean equals(Object arg0) {
+
+ return this.getClass().equals(arg0.getClass());
+ }
+
+ @Override
+ public int hashCode() {
+
+ return getClass().hashCode();
+ }
+ }
+
+ protected void resourceChanged(Resource aResource) {
+ clearCache();
+ }
+
+ private void addManagedResource() {
+ if(projectResource == null)
+ projectResource = createResource();
+ if (projectResource != null && !projectResource.eAdapters().contains(resourceAdapter))
+ projectResource.eAdapters().add(resourceAdapter);
+ }
+
+ protected void removeResource() {
+ if(projectResource != null) {
+ projectResource.eAdapters().remove(resourceAdapter);
+ projectResource = null;
+ }
+ }
+
+ protected void initializeResource() {
+ projectResource = createResource();
+ addManagedResource();
+ }
+
+ protected Resource createResource() {
+ StructureEdit core = null;
+ Resource res = null;
+ try {
+ core = StructureEdit.getStructureEditForRead(getProject());
+ if (core == null)
+ return null;
+ WorkbenchComponent component = core.getComponent();
+ if(component != null)
+ res = component.eResource();
+ } finally {
+ if(core != null)
+ core.dispose();
+ }
+ return res;
+ }
+
+ public void dispose() {
+ removeResource();
+ }
+
protected VirtualComponent(){
}
@@ -61,6 +143,7 @@
componentProject = aProject;
runtimePath = aRuntimePath;
rootFolder = ComponentCore.createFolder(componentProject, new Path("/")); //$NON-NLS-1$
+ initializeResource();
}
public IVirtualComponent getComponent() {
@@ -68,10 +151,17 @@
}
public String getName() {
- return getProject().getName();
+ if(name == null){
+ name = getProject().getName();
+ }
+ return name;
}
public String getDeployedName() {
+ if(deploymentName != null) {
+ return deploymentName;
+ }
+
StructureEdit core = null;
IProject project = getProject();
try {
@@ -79,15 +169,18 @@
core = StructureEdit.getStructureEditForRead(project);
if(core != null && core.getComponent() != null){
WorkbenchComponent component = core.getComponent();
- if (component.getName()!=null && component.getName().length()>0)
- return component.getName();
+ if (component.getName()!=null && component.getName().length()>0) {
+ deploymentName = component.getName();
+ return deploymentName;
+ }
}
}
} finally {
if(core != null)
core.dispose();
}
- return getProject().getName();
+ deploymentName = getProject().getName();
+ return deploymentName;
}
public boolean exists() {
@@ -97,8 +190,13 @@
public Properties getMetaProperties() {
+ if(metaProperties != null) {
+ return metaProperties;
+ }
+
StructureEdit core = null;
Properties props = new Properties();
+ metaProperties = props;
try {
core = StructureEdit.getStructureEditForRead(getProject());
if (core == null)
@@ -119,7 +217,8 @@
props.setProperty(name, value);
}
}
- return props;
+ metaProperties = props;
+ return props;
} finally {
if(core != null)
core.dispose();
@@ -150,6 +249,7 @@
// Add new property
propList.add(prop);
}
+ clearCache();
}
} finally {
if(core != null){
@@ -165,6 +265,7 @@
core = StructureEdit.getStructureEditForWrite(getProject());
WorkbenchComponent component = core.getComponent();
component.getProperties().clear();
+ clearCache();
} finally {
if(core != null){
core.saveIfNecessary(null);
@@ -192,7 +293,7 @@
prop.setName(key);
prop.setValue(value);
component.getProperties().add(prop);
-
+ clearCache();
} finally {
if(core != null){
core.saveIfNecessary(null);
@@ -202,6 +303,9 @@
}
public IPath[] getMetaResources() {
+ if(cacheMetaResources != null)
+ return cacheMetaResources;
+
StructureEdit moduleCore = null;
List metaResources = new ArrayList();
try {
@@ -216,7 +320,8 @@
moduleCore.dispose();
}
}
- return (IPath[]) metaResources.toArray(new IPath[metaResources.size()]);
+ cacheMetaResources = (IPath[]) metaResources.toArray(new IPath[metaResources.size()]);
+ return cacheMetaResources;
}
public void setMetaResources(IPath[] theMetaResourcePaths) {
@@ -229,6 +334,7 @@
if (!component.getMetadataResources().contains(theMetaResourcePaths[i]))
component.getMetadataResources().add(theMetaResourcePaths[i]);
}
+ clearCache();
}
} finally {
if (moduleCore != null) {
@@ -267,12 +373,51 @@
}
}
}
-
- public IVirtualReference[] getReferences(Map<String, Object> options) {
- return getReferences();
+
+ /**
+ * Returns a raw list of references exactly as defined in
+ * .settings/org.eclipse.wst.common.component
+ *
+ * @return
+ */
+ public final IVirtualReference[] getRawReferences() {
+ if (rawReferencesArray != null) {
+ return rawReferencesArray;
+ }
+ StructureEdit core = null;
+ List references = new ArrayList();
+ try {
+ core = StructureEdit.getStructureEditForRead(getProject());
+ if (core != null && core.getComponent() != null) {
+ WorkbenchComponent component = core.getComponent();
+ if (component != null) {
+ List referencedComponents = component.getReferencedComponents();
+ for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) {
+ ReferencedComponent referencedComponent = (ReferencedComponent) iter.next();
+ if (referencedComponent == null) {
+ continue;
+ }
+ IVirtualReference vReference = StructureEdit.createVirtualReference(this, referencedComponent);
+ if (vReference != null && vReference.getReferencedComponent() != null && vReference.getReferencedComponent().exists()) {
+ references.add(vReference);
+ }
+ }
+ }
+ }
+ rawReferencesArray = (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]);
+ return rawReferencesArray;
+ } finally {
+ if (core != null) {
+ core.dispose();
+ }
+ }
}
- public IVirtualReference[] getReferences() {
+
+ public IVirtualReference[] getReferences(Map<String, Object> options) {
+ if(referencesArray != null) {
+ return referencesArray;
+ }
StructureEdit core = null;
List references = new ArrayList();
try {
@@ -286,20 +431,29 @@
if (referencedComponent==null)
continue;
IVirtualReference vReference = StructureEdit.createVirtualReference(this, referencedComponent);
- if( vReference != null ){
- vReference.setArchiveName( referencedComponent.getArchiveName() );
- }
- if (vReference != null && vReference.getReferencedComponent() != null && vReference.getReferencedComponent().exists())
+ if (vReference != null && vReference.getReferencedComponent() != null && vReference.getReferencedComponent().exists()){
references.add(vReference);
+ customizeCreatedReference(vReference, referencedComponent);
+ }
}
}
}
- return (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]);
+ referencesArray = (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]);
+ return referencesArray;
} finally {
if(core != null)
core.dispose();
}
}
+
+ protected void customizeCreatedReference(IVirtualReference reference, Object dependentObject) {
+ // Do Nothing
+ }
+
+ public IVirtualReference[] getReferences() {
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ return getReferences(map);
+ }
public void addReferences(IVirtualReference[] references) {
if (references==null || references.length==0)
@@ -309,28 +463,18 @@
core = StructureEdit.getStructureEditForWrite(getProject());
if (core == null)
return;
+ clearCache();
WorkbenchComponent component = core.getComponent();
ReferencedComponent referencedComponent = null;
ComponentcoreFactory factory = ComponentcorePackage.eINSTANCE.getComponentcoreFactory();
+ IReferenceResolver resolver = null;
for (int i=0; i<references.length; i++) {
if (references[i] == null)
continue;
- referencedComponent = factory.createReferencedComponent();
- referencedComponent.setDependencyType(DependencyType.get(references[i].getDependencyType()));
- referencedComponent.setRuntimePath(references[i].getRuntimePath());
-
- IVirtualComponent comp = references[i].getReferencedComponent();
- if(comp!=null && !comp.isBinary())
- referencedComponent.setHandle(ModuleURIUtil.fullyQualifyURI(comp.getProject()));
- else if (comp!=null)
- referencedComponent.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(comp.getName()));
+ resolver = ReferenceResolverUtil.getDefault().getResolver(references[i]);
+ referencedComponent = resolver.resolve(references[i]);
if (component != null)
component.getReferencedComponents().add(referencedComponent);
- referencedComponent.setArchiveName(references[i].getArchiveName());
- }
- //clean up any old obsolete references
- if (component != null){
- cleanUpReferences(component);
}
} finally {
if(core != null) {
@@ -340,41 +484,22 @@
}
}
- private void cleanUpReferences(WorkbenchComponent component) {
- List referencedComponents = component.getReferencedComponents();
- for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) {
- ReferencedComponent referencedComponent = (ReferencedComponent) iter.next();
- if (referencedComponent==null)
- continue;
- IVirtualReference vReference = StructureEdit.createVirtualReference(this, referencedComponent);
- if (vReference == null || vReference.getReferencedComponent() == null || !vReference.getReferencedComponent().exists()){
- iter.remove();
- }
- }
- }
-
public void setReferences(IVirtualReference[] references) {
StructureEdit core = null;
try {
core = StructureEdit.getStructureEditForWrite(getProject());
WorkbenchComponent component = core.getComponent();
ReferencedComponent referencedComponent = null;
-
+
+ clearCache();
component.getReferencedComponents().clear();
ComponentcoreFactory factory = ComponentcorePackage.eINSTANCE.getComponentcoreFactory();
+ IReferenceResolver resolver = null;
for (int i=0; i<references.length; i++) {
- referencedComponent = factory.createReferencedComponent();
- referencedComponent.setDependencyType(DependencyType.get(references[i].getDependencyType()));
- referencedComponent.setRuntimePath(references[i].getRuntimePath());
-
- IVirtualComponent comp = references[i].getReferencedComponent();
- if( !comp.isBinary())
- referencedComponent.setHandle(ModuleURIUtil.fullyQualifyURI(references[i].getReferencedComponent().getProject()));
- else
- referencedComponent.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(references[i].getReferencedComponent().getName()));
-
- referencedComponent.setArchiveName(references[i].getArchiveName());
- component.getReferencedComponents().add(referencedComponent);
+ resolver = ReferenceResolverUtil.getDefault().getResolver(references[i]);
+ referencedComponent = resolver.resolve(references[i]);
+ if( referencedComponent != null)
+ component.getReferencedComponents().add(referencedComponent);
}
} finally {
@@ -386,6 +511,7 @@
}
public int hashCode() {
+ if(componentProject == null) return super.hashCode(); //If component factory instance, don't use project to hash
int hash = HashUtil.SEED;
hash = HashUtil.hash(hash, getProject().getName());
hash = HashUtil.hash(hash, getName());
@@ -393,7 +519,9 @@
return hash;
}
- public boolean equals(Object anOther) {
+ public boolean equals(Object anOther) {
+ if(componentProject == null) return super.equals(anOther); //If component factory instance, don't use project to compare
+ if(anOther == this) return true;
if(anOther instanceof IVirtualComponent) {
IVirtualComponent otherComponent = (IVirtualComponent) anOther;
return getProject().equals(otherComponent.getProject()) &&
@@ -404,12 +532,20 @@
}
public IVirtualReference getReference(String aComponentName) {
+ if(referenceMap == null){
+ referenceMap = new Hashtable<String, IVirtualReference>();
+ } else if(referenceMap.containsKey(aComponentName)) {
+ return (IVirtualReference) referenceMap.get(aComponentName);
+ }
+
IVirtualReference[] refs = getReferences();
for (int i = 0; i < refs.length; i++) {
IVirtualReference reference = refs[i];
if( reference.getReferencedComponent() != null ){
- if (reference.getReferencedComponent().getName().equals(aComponentName))
+ if (reference.getReferencedComponent().getName().equals(aComponentName)) {
+ referenceMap.put(aComponentName, reference);
return reference;
+ }
}
}
return null;
@@ -434,10 +570,11 @@
* @return array of components
*/
public IVirtualComponent[] getReferencingComponents() {
- IProject[] handles = DependencyGraphManager.getInstance().getDependencyGraph().getReferencingComponents(getProject());
- IVirtualComponent[] result = new IVirtualComponent[handles.length];
- for (int i=0; i<handles.length; i++)
- result[i] = ComponentCore.createComponent(handles[i]);
+ Set<IProject> projects = IDependencyGraph.INSTANCE.getReferencingComponents(getProject());
+ IVirtualComponent[] result = new IVirtualComponent[projects.size()];
+ Iterator<IProject> i = projects.iterator();
+ for (int j=0; j<projects.size(); j++)
+ result[j] = ComponentCore.createComponent(i.next());
return result;
}
@@ -450,13 +587,18 @@
public void removeReference(IVirtualReference aReference) {
StructureEdit core = null;
try {
- core = StructureEdit.getStructureEditForWrite(getProject());
- if (core == null || aReference == null)
+ if(aReference == null)
return;
+ core = StructureEdit.getStructureEditForWrite(getProject());
+ if (core == null) {
+ return;
+ }
+ clearCache();
WorkbenchComponent component = core.getComponent();
ReferencedComponent refComponent = getWorkbenchReferencedComponent(aReference, component);
- if (component != null && refComponent != null)
+ if (component != null && refComponent != null) {
component.getReferencedComponents().remove(refComponent);
+ }
} finally {
if(core != null) {
core.saveIfNecessary(null);
@@ -477,25 +619,26 @@
if (aReference == null || aReference.getReferencedComponent() == null || component == null)
return null;
List referencedComponents = component.getReferencedComponents();
+ URI uri = ReferenceResolverUtil.getDefault().getResolver(aReference).resolve(aReference).getHandle();
for (int i=0; i<referencedComponents.size(); i++) {
ReferencedComponent ref = (ReferencedComponent) referencedComponents.get(i);
- if (!aReference.getReferencedComponent().isBinary()) {
- if (ref.getHandle().equals(ModuleURIUtil.fullyQualifyURI(aReference.getReferencedComponent().getProject())))
- return ref;
- }
- else {
- if (ref.getHandle().equals(ModuleURIUtil.archiveComponentfullyQualifyURI(aReference.getReferencedComponent().getName())))
- return ref;
- }
+ if( ref.getHandle().equals(uri))
+ return ref;
}
return null;
}
+ protected boolean shouldCacheReferences() {
+ return true;
+ }
/**
* @return IVirtualReference[] - All the references of this component, including potentially deleted references
*/
public IVirtualReference[] getAllReferences() {
+ if(shouldCacheReferences() && allReferences != null)
+ return allReferences;
+
StructureEdit core = null;
List references = new ArrayList();
try {
@@ -517,13 +660,35 @@
}
}
}
- return (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]);
+ allReferences = (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]);
+ return allReferences;
} finally {
if(core != null)
core.dispose();
}
}
+ /**
+ * This is an internal method and should not be called except by the
+ * {@link org.eclipse.wst.common.component.internal.builder.DependencyGraphImpl}
+ */
+ public void flushCache() {
+ clearCache();
+ }
+
+ protected void clearCache() {
+ name = null;
+ deploymentName = null;
+ if(referenceMap != null) {
+ referenceMap.clear();
+ }
+ rawReferencesArray = null;
+ referencesArray = null;
+ metaProperties = null;
+ cacheMetaResources = null;
+ allReferences = null;
+ }
+
public String toString() {
return componentProject.toString();
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
index 51f4f15..b775aca 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
@@ -72,29 +72,29 @@
}
public IVirtualResource findMember(IPath aPath, int theSearchFlags) {
-
StructureEdit structureEdit = null;
try {
-
structureEdit = StructureEdit.getStructureEditForRead(getProject());
- WorkbenchComponent component = structureEdit.getComponent();
- if (null != component) {
- ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
- ComponentResource[] resources = root.findModuleResources(getRuntimePath().append(aPath), ResourceTreeNode.CREATE_NONE);
-
- for (int i = 0; i < resources.length; i++) {
- // return the resources corresponding to the root, not any of the children if its a folder
- if (resources[i].getRuntimePath().equals(getRuntimePath().append(aPath))) {
- IResource platformResource = getProject().findMember(resources[i].getSourcePath());
- if (platformResource == null)
- platformResource = ResourcesPlugin.getWorkspace().getRoot().findMember(resources[i].getSourcePath());
- if (platformResource != null) {
- switch (platformResource.getType()) {
- case IResource.FOLDER :
- case IResource.PROJECT :
- return ComponentCore.createFolder(getProject(), getRuntimePath().append(aPath));
- case IResource.FILE :
- return new VirtualFile(getProject(), getRuntimePath().append(aPath));
+ if(structureEdit != null){
+ WorkbenchComponent component = structureEdit.getComponent();
+ if (null != component) {
+ ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
+ ComponentResource[] resources = root.findModuleResources(getRuntimePath().append(aPath), ResourceTreeNode.CREATE_NONE);
+
+ for (int i = 0; i < resources.length; i++) {
+ // return the resources corresponding to the root, not any of the children if its a folder
+ if (resources[i].getRuntimePath().equals(getRuntimePath().append(aPath))) {
+ IResource platformResource = getProject().findMember(resources[i].getSourcePath());
+ if (platformResource == null)
+ platformResource = ResourcesPlugin.getWorkspace().getRoot().findMember(resources[i].getSourcePath());
+ if (platformResource != null) {
+ switch (platformResource.getType()) {
+ case IResource.FOLDER :
+ case IResource.PROJECT :
+ return ComponentCore.createFolder(getProject(), getRuntimePath().append(aPath));
+ case IResource.FILE :
+ return new VirtualFile(getProject(), getRuntimePath().append(aPath));
+ }
}
}
}
@@ -352,11 +352,14 @@
private IVirtualResource createVirtualResource(ComponentResource aComponentResource) {
IResource resource = StructureEdit.getEclipseResource(aComponentResource);
- switch (resource.getType()) {
- case IResource.FILE :
- return ComponentCore.createFile(getProject(), aComponentResource.getRuntimePath());
- case IResource.FOLDER :
- return ComponentCore.createFolder(getProject(), aComponentResource.getRuntimePath());
+ if (resource != null)
+ {
+ switch (resource.getType()) {
+ case IResource.FILE :
+ return ComponentCore.createFile(getProject(), aComponentResource.getRuntimePath());
+ case IResource.FOLDER :
+ return ComponentCore.createFolder(getProject(), aComponentResource.getRuntimePath());
+ }
}
return null;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
index ee9ec04..9aa66c6 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
@@ -119,4 +119,15 @@
//Default
}
+ @Override
+ public Object getAdapter(Class adapter) {
+ if( java.io.File.class.equals(adapter)) {
+ IFile file = getUnderlyingFile();
+ return file.getLocation().toFile();
+ }
+ if( IFile.class.equals(adapter)) {
+ return getUnderlyingFile();
+ }
+ return null;
+ }
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualReference.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualReference.java
index 007b1ce..9e2c736 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualReference.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * 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
@@ -16,15 +16,16 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
+import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
+import org.eclipse.wst.common.componentcore.resolvers.ReferenceResolverUtil;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.frameworks.internal.HashUtil;
public class VirtualReference implements IVirtualReference {
@@ -33,24 +34,31 @@
private IPath runtimePath;
private int dependencyType;
private String archiveName;
-
+ private boolean derived;
public VirtualReference() {
}
public VirtualReference(IVirtualComponent anEnclosingComponent, IVirtualComponent aReferencedComponent) {
- this(anEnclosingComponent, aReferencedComponent, new Path(String.valueOf(IPath.SEPARATOR)), DEPENDENCY_TYPE_USES);
+ this(anEnclosingComponent, aReferencedComponent, new Path(String.valueOf(IPath.SEPARATOR)), DEPENDENCY_TYPE_USES, false);
}
public VirtualReference(IVirtualComponent anEnclosingComponent, IVirtualComponent aReferencedComponent, IPath aRuntimePath) {
- this(anEnclosingComponent, aReferencedComponent, aRuntimePath, DEPENDENCY_TYPE_USES);
+ this(anEnclosingComponent, aReferencedComponent, aRuntimePath, DEPENDENCY_TYPE_USES, false);
}
- public VirtualReference(IVirtualComponent anEnclosingComponent, IVirtualComponent aReferencedComponent, IPath aRuntimePath, int aDependencyType) {
+ public VirtualReference(IVirtualComponent anEnclosingComponent, IVirtualComponent aReferencedComponent,
+ IPath aRuntimePath, int aDependencyType) {
+ this(anEnclosingComponent, aReferencedComponent, aRuntimePath, aDependencyType, false);
+ }
+
+ public VirtualReference(IVirtualComponent anEnclosingComponent, IVirtualComponent aReferencedComponent,
+ IPath aRuntimePath, int aDependencyType, boolean isDerived) {
enclosingComponent = anEnclosingComponent;
referencedComponent = aReferencedComponent;
runtimePath = aRuntimePath;
dependencyType = aDependencyType;
+ derived = isDerived;
}
public void create(int updateFlags, IProgressMonitor aMonitor) {
@@ -59,14 +67,8 @@
core = StructureEdit.getStructureEditForWrite(enclosingComponent.getProject());
WorkbenchComponent component = core.getComponent();
List referencedComponents = component.getReferencedComponents();
- ReferencedComponent refComp = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent();
- if( !referencedComponent.isBinary())
- refComp.setHandle(ModuleURIUtil.fullyQualifyURI(referencedComponent.getProject()));
- else
- refComp.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(referencedComponent.getName()));
- refComp.setRuntimePath(runtimePath);
- refComp.setDependencyType(DependencyType.get(dependencyType));
- refComp.setArchiveName(archiveName);
+ IReferenceResolver resolver = ReferenceResolverUtil.getDefault().getResolver(this);
+ ReferencedComponent refComp = resolver.resolve(this);
if(!referencedComponents.contains(refComp)){
referencedComponents.add(refComp);
}
@@ -123,10 +125,9 @@
ReferencedComponent actualReferencedComponent = enclosingCore.findReferencedComponent(enclosingComp, refComp);
if (actualReferencedComponent != null) {
referencedComponent = aReferencedComponent;
- if(!referencedComponent.isBinary())
- actualReferencedComponent.setHandle(ModuleURIUtil.fullyQualifyURI(referencedComponent.getProject()));
- else
- actualReferencedComponent.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(referencedComponent.getName()));
+ IReferenceResolver resolver = ReferenceResolverUtil.getDefault().getResolver(this);
+ URI uri = resolver.resolve(this).getHandle();
+ actualReferencedComponent.setHandle(uri);
actualReferencedComponent.setDependentObject(dependentObject);
}
} finally {
@@ -148,4 +149,35 @@
public void setArchiveName(String archiveName) {
this.archiveName = archiveName;
}
+
+ public boolean isDerived() {
+ return derived;
+ }
+
+ public void setDerived(boolean val) {
+ derived = val;
+ }
+
+ public boolean equals(Object anOther) {
+ if(anOther == null || !(anOther instanceof IVirtualReference)) return false;
+ if(anOther == this) return true;
+ IVirtualReference otherRef = (IVirtualReference) anOther;
+ return (getArchiveName() != null ? getArchiveName().equals(otherRef.getArchiveName()) : (otherRef.getArchiveName() == null ? true : false)) &&
+ getRuntimePath().equals(otherRef.getRuntimePath()) &&
+ getEnclosingComponent().equals(otherRef.getEnclosingComponent()) &&
+ getReferencedComponent().equals(otherRef.getReferencedComponent()) &&
+ getDependencyType() == otherRef.getDependencyType();
+
+ }
+
+ public int hashCode() {
+
+ int hash = HashUtil.SEED;
+ hash = HashUtil.hash(hash, getArchiveName());
+ hash = HashUtil.hash(hash, getRuntimePath());
+ hash = HashUtil.hash(hash, getEnclosingComponent());
+ hash = HashUtil.hash(hash, getReferencedComponent());
+ hash = HashUtil.hash(hash, getDependencyType());
+ return hash;
+ }
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
index 5f637f9..c8815de 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
@@ -297,14 +297,16 @@
StructureEdit moduleCore = null;
try {
moduleCore = StructureEdit.getStructureEditForWrite(getProject());
- WorkbenchComponent component = moduleCore.getComponent();
- if (component != null) {
- ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
- ComponentResource[] resources = root.findModuleResources(getRuntimePath(), ResourceTreeNode.CREATE_NONE);
- if (resources.length > 0) {
- for (int resourceIndx = 0; resourceIndx < resources.length; resourceIndx++) {
- if (aProjectRelativeLocation.makeAbsolute().equals(resources[resourceIndx].getSourcePath())) {
- component.getResources().remove(resources[resourceIndx]);
+ if( moduleCore != null ) {
+ WorkbenchComponent component = moduleCore.getComponent();
+ if (component != null) {
+ ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
+ ComponentResource[] resources = root.findModuleResources(getRuntimePath(), ResourceTreeNode.CREATE_NONE);
+ if (resources.length > 0) {
+ for (int resourceIndx = 0; resourceIndx < resources.length; resourceIndx++) {
+ if (aProjectRelativeLocation.makeAbsolute().equals(resources[resourceIndx].getSourcePath())) {
+ component.getResources().remove(resources[resourceIndx]);
+ }
}
}
}
@@ -312,7 +314,7 @@
}
finally {
if (moduleCore != null) {
- if (component != null)
+ if (getComponent() != null)
moduleCore.saveIfNecessary(monitor);
moduleCore.dispose();
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
index 60a9feb..c9755c6 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
@@ -10,17 +10,25 @@
*******************************************************************************/
package org.eclipse.wst.common.componentcore.internal.util;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
-
+import java.util.Set;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jem.util.RegistryReader;
+import org.eclipse.jem.util.emf.workbench.ISynchronizerExtender;
+import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
+import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
import org.eclipse.wst.common.componentcore.internal.resources.ResourceTimestampMappings;
@@ -31,16 +39,20 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-public class ComponentImplManager {
+
+
+public class ComponentImplManager implements ISynchronizerExtender{
private static final String NO_FACETS = "NONE";//$NON-NLS-1$
-
+
private static final String COMPONENT_IMPL_EXTENSION_POINT = "componentimpl"; //$NON-NLS-1$
private static final String TAG_COMPONENT_IMPL = "componentimpl"; //$NON-NLS-1$
private static final String ATT_TYPE = "typeID"; //$NON-NLS-1$
private static final String ATT_CLASS = "class"; //$NON-NLS-1$
+ private static final String EXTENDED_ELEMENT="extendedTypeID"; //$NON-NLS-1$
private static final ComponentImplManager instance = new ComponentImplManager();
// private static final Object LOAD_FAILED = new Object();
@@ -48,7 +60,7 @@
private final Map/* <String, ComponentImplDescriptor> */ descriptors = new Hashtable();
private final Map/* <ComponentImplDescriptor, IComponentImplFactory> */ instances = new Hashtable();
- private final ResourceTimestampMappings factoryMap = new ResourceTimestampMappings();
+ private ArrayList<HashSet> sortedDescriptorsKeyList = new ArrayList<HashSet>();
/**
* @return Returns the instance.
@@ -67,13 +79,25 @@
public void run() throws Exception {
new ComponentImplRegistryReader().readRegistry();
- }
+ //sort descriptors keys by size, bigger size is at lower index
+ if( descriptors != null ){
+ sortedDescriptorsKeyList.addAll(descriptors.keySet());
+
+ final Comparator<HashSet> comp = new Comparator<HashSet>() {
+ public int compare(final HashSet descriptor1, final HashSet descriptor2) {
+ if( descriptor1.size() == descriptor2.size() )
+ return 0;
+ return descriptor1.size() < descriptor2.size() ? 1 : -1;
+ }
+ };
+ Collections.sort(sortedDescriptorsKeyList, comp);
+ }
+ }
});
}
-
-
- private IComponentImplFactory getComponentImplFactory(String typeID) {
+
+ private IComponentImplFactory getComponentImplFactory(HashSet typeID) {
ComponentImplDescriptor descriptor = (ComponentImplDescriptor) descriptors.get(typeID);
IComponentImplFactory factory = null;
@@ -93,119 +117,318 @@
}
return factory;
}
-
- private IComponentImplFactory findFactoryForProject(IProject project){
- try {
- IComponentImplFactory factory = null;
-
- if( !factoryMap.hasChanged(project) ) {
+
+
- if( factoryMap.hasCacheError(project))
- return null;
-
- if( factoryMap.hasCacheData(project))
- return (IComponentImplFactory) factoryMap.getData(project);
- }
-
+ private IComponentImplFactory findFactoryForProject(IProject project, Map descriptors){
+ try {
+ IComponentImplFactory factory = ComponentCacheManager.instance().getComponentImplFactory(project);
+
+ if(factory != null)
+ return factory;
+
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if (facetedProject == null){
- factory = getComponentImplFactory(NO_FACETS);
- factoryMap.mark(project, factory);
+ HashSet set = new HashSet();
+ set.add(NO_FACETS);
+ factory = getComponentImplFactory(set);
+ ComponentCacheManager.instance().setComponentImplFactory(project, factory);
return factory;
}
- Iterator keys = descriptors.keySet().iterator();
- while (keys.hasNext()) {
- String typeID = (String) keys.next();
- if(typeID.equals(NO_FACETS)){
- continue;
- }
- try {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- if (projectFacet != null && facetedProject.hasProjectFacet(projectFacet)){
- factory = getComponentImplFactory(typeID);
- if(null != factory){
- factoryMap.mark(project, factory);
- return factory;
- }
- }
- } catch (Exception e) {
- continue;
- }
- }
-
+ return findFactorySupportingFacetsForProject(facetedProject);
+
} catch (Exception e) {
ModulecorePlugin.logError(0, "Returning null factory for project: " + project, e); //$NON-NLS-1$
- factoryMap.markError(project);
+ ComponentCacheManager.instance().markErrorComponentImplFactory(project);
}
return null;
}
-
+
+
+ private IComponentImplFactory findFactorySupportingFacetsForProject(IFacetedProject facetedProject){
+ Set<IProjectFacetVersion> projectFacets = facetedProject.getProjectFacets();
+
+ IComponentImplFactory factory = null;
+
+ if( sortedDescriptorsKeyList != null ){
+ for( HashSet key : sortedDescriptorsKeyList ){
+
+ boolean invalidDescriptor = false;
+ Iterator iterator = key.iterator();
+
+ while (iterator.hasNext()) {
+
+ String typeID = (String) iterator.next();
+ IProjectFacet projectFacet = null;
+ try{
+ projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ }catch(Exception e){
+ invalidDescriptor = true;
+ break;
+ }
+ //if a project does not have a facet supported by this type, return
+ if (projectFacet != null && !facetedProject.hasProjectFacet(projectFacet)){
+ invalidDescriptor = true;
+ break;
+ }
+ }
+ if( !invalidDescriptor ){
+ factory = getComponentImplFactory(key);
+ if(null != factory){
+ ComponentCacheManager.instance().setComponentImplFactory(facetedProject.getProject(), factory);
+ return factory;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
public IVirtualFolder createFolder(IProject aProject, IPath aRuntimePath){
try {
- IComponentImplFactory factory = findFactoryForProject(aProject);
+ IComponentImplFactory factory = findFactoryForProject(aProject, descriptors);
if(null != factory){
return factory.createFolder(aProject, aRuntimePath);
}
} catch (Exception e) {
// Just return a default folder
}
+ ComponentCacheManager.instance().setComponentImplFactory(aProject, null);
return new VirtualFolder(aProject, aRuntimePath);
}
public IVirtualComponent createComponent(IProject project) {
- try {
- IComponentImplFactory factory = findFactoryForProject(project);
- if(null != factory){
- return factory.createComponent(project);
- }
- } catch (Exception e) {
- // Just return a default component
- }
- if (!ModuleCoreNature.isFlexibleProject(project)){
- return null;
- }
- return new VirtualComponent(project, new Path("/")); //$NON-NLS-1$
+ return createComponent(project, true);
}
public IVirtualComponent createComponent(IProject project, boolean checkSettings) {
- if (checkSettings)
- return createComponent(project);
try {
- IComponentImplFactory factory = findFactoryForProject(project);
+ IVirtualComponent component = ComponentCacheManager.instance().getComponent(project);
+ if(component != null) {
+ return component;
+ }
+
+ IComponentImplFactory factory = findFactoryForProject(project, descriptors);
if(null != factory){
- return factory.createComponent(project);
+ component = factory.createComponent(project);
+ if(component != null) {
+ ComponentCacheManager.instance().setComponent(project, component);
+ registerListener(project);
+ }
+ return component;
}
} catch (Exception e) {
// Just return a default component
}
- if (ModuleCoreNature.getModuleCoreNature(project) == null){
- return null;
+ if(checkSettings) {
+ if (!ModuleCoreNature.isFlexibleProject(project)){
+ return null;
+ }
}
- return new VirtualComponent(project, new Path("/")); //$NON-NLS-1$
+ else {
+ if (ModuleCoreNature.getModuleCoreNature(project) == null){
+ return null;
+ }
+ }
+ IVirtualComponent component = new VirtualComponent(project, new Path("/")); //$NON-NLS-1$
+ if(component != null) {
+ ComponentCacheManager.instance().setComponentImplFactory(project, null);
+ ComponentCacheManager.instance().setComponent(project, component);
+ registerListener(project);
+ }
+
+ return component;
}
public IVirtualComponent createArchiveComponent(IProject aProject, String aComponentName) {
+ return createArchiveComponent(aProject, aComponentName, new Path("/"));
+ }
+
+ public IVirtualComponent createArchiveComponent(IProject aProject, String aComponentName, IPath path) {
+ path = path == null ? new Path("/") : path; //$NON-NLS-1$
try {
- IComponentImplFactory factory = findFactoryForProject(aProject);
+ IVirtualComponent component = ComponentCacheManager.instance().getArchiveComponent(aProject, aComponentName);
+ if(component != null)
+ return component;
+
+ if(!ComponentCacheManager.instance().isValidComponentImplFactory(aProject)) {
+ registerListener(aProject);
+ }
+
+ IComponentImplFactory factory = findFactoryForProject(aProject, descriptors);
if(null != factory){
- return factory.createArchiveComponent(aProject, aComponentName, new Path("/")); //$NON-NLS-1$
+ IVirtualComponent archiveComponent = factory.createArchiveComponent(aProject, aComponentName, path);
+ ComponentCacheManager.instance().setArchiveComponent(aProject, aComponentName, archiveComponent);
+ return archiveComponent;
}
} catch (Exception e) {
// Just return a default archive component
}
- return new VirtualArchiveComponent(aProject, aComponentName, new Path("/")); //$NON-NLS-1$
+ ComponentCacheManager.instance().setComponentImplFactory(aProject, null);
+ IVirtualComponent archiveComponent = new VirtualArchiveComponent(aProject, aComponentName, path); //$NON-NLS-1$
+ ComponentCacheManager.instance().setArchiveComponent(aProject, aComponentName, archiveComponent);
+ return archiveComponent;
}
+ private void registerListener(IProject aProject) {
+ ProjectResourceSet resSet = getResourceSet(aProject);
+ if (resSet == null || resSet.getSynchronizer() == null)
+ return;
+ resSet.getSynchronizer().addExtender(this);
+ }
+
+ protected ProjectResourceSet getResourceSet(IProject proj) {
+ return (ProjectResourceSet)WorkbenchResourceHelperBase.getResourceSet(proj);
+ }
+
+ public void projectChanged(IResourceDelta delta) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public synchronized void projectClosed() {
+ ComponentCacheManager.instance().clearCache();
+ }
+
+ private static class ComponentCacheManager {
+ private static final ComponentCacheManager instance = new ComponentCacheManager();
+
+ private final ResourceTimestampMappings factoryMap = new ResourceTimestampMappings();
+ private final Map <IProject , IVirtualComponent> componentsMap = new Hashtable<IProject , IVirtualComponent>();
+ private final Map <IProject , Map<String, IVirtualComponent>> componentsArchivesMap = new Hashtable<IProject , Map<String, IVirtualComponent>>();
+
+ private Object cacheLock = new Object();
+
+ public ComponentCacheManager() {}
+
+ public static ComponentCacheManager instance() {
+ return instance;
+ }
+
+ public IComponentImplFactory getComponentImplFactory(IProject project) {
+ synchronized (cacheLock) {
+ if(isValidComponentImplFactory(project)) {
+ Object data = factoryMap.getData(project);
+ if(data instanceof IComponentImplFactory)
+ return (IComponentImplFactory) data;
+ }
+ return null;
+ }
+ }
+
+ public boolean isValidComponentImplFactory(IProject project) {
+ synchronized (cacheLock) {
+ if(!factoryMap.hasChanged(project) && !factoryMap.hasCacheError(project) && factoryMap.hasCacheData(project))
+ return true;
+ return false;
+ }
+ }
+
+ public void setComponentImplFactory(IProject project, IComponentImplFactory factory){
+ synchronized (cacheLock) {
+ if(factory != null) {
+ factoryMap.mark(project, factory);
+ }
+ else {
+ factoryMap.mark(project, project);
+ }
+ }
+ }
+
+ public void markErrorComponentImplFactory(IProject project){
+ synchronized (cacheLock) {
+ factoryMap.markError(project);
+ }
+ }
+
+ public IVirtualComponent getComponent(IProject project) {
+ synchronized (cacheLock) {
+ if(componentsMap.containsKey(project)) {
+ if(isValidComponentImplFactory(project)) {
+ return componentsMap.get(project);
+ } else {
+ componentsMap.remove(project);
+ }
+ }
+ return null;
+ }
+ }
+
+ public void setComponent(IProject project, IVirtualComponent component) {
+ synchronized (cacheLock) {
+ if(component != null)
+ componentsMap.put(project, component);
+ }
+ }
+
+ public IVirtualComponent getArchiveComponent(IProject project, String componentName) {
+ synchronized (cacheLock) {
+ Map archives = getComponentArchives(project);
+ if(isValidComponentImplFactory(project)) {
+ if(archives.containsKey(componentName)) {
+ return (IVirtualComponent) archives.get(componentName);
+ }
+ }
+ else {
+ archives = new Hashtable<String, IVirtualComponent>();
+ componentsArchivesMap.put(project, archives);
+ }
+ return null;
+ }
+ }
+
+ public Map getComponentArchives(IProject project) {
+ synchronized (cacheLock) {
+ Map archives = componentsArchivesMap.get(project);
+ if(archives == null) {
+ archives = new Hashtable<String, IVirtualComponent>();
+ componentsArchivesMap.put(project, archives);
+ }
+ return archives;
+ }
+ }
+
+ public void setArchiveComponent(IProject project, String componentName, IVirtualComponent archiveComponent) {
+ synchronized (cacheLock) {
+ if(archiveComponent != null) {
+ Map archives = ComponentCacheManager.instance().getComponentArchives(project);
+ archives.put(componentName, archiveComponent);
+ }
+ }
+ }
+
+
+ public void clearCache() {
+ Object[] components = null;
+ Object[] componentsArchives = null;
+ synchronized (cacheLock) {
+ components = (Object[]) componentsMap.values().toArray();
+ componentsMap.clear();
+
+ componentsArchives = (Object[]) componentsArchivesMap.values().toArray();
+ componentsArchivesMap.clear();
+ }
+
+ for(int i = 0; i < components.length; i++) {
+ if(components[i] instanceof VirtualComponent)
+ ((VirtualComponent)components[i]).dispose();
+ }
+
+ for(int i = 0; i < componentsArchives.length; i++) {
+ if(componentsArchives[i] instanceof VirtualComponent)
+ ((VirtualComponent)componentsArchives[i]).dispose();
+ }
+ }
+ }
+
private class ComponentImplDescriptor {
private final IConfigurationElement element;
- private final String type;
-
+
public ComponentImplDescriptor(IConfigurationElement configElement) {
element = configElement;
- type = element.getAttribute(ATT_TYPE);
}
/**
@@ -233,15 +456,6 @@
return factory[0];
}
-
- /**
- *
- * @return The type id of this ArtifactEdit definition
- */
- public String getType() {
- return type;
- }
-
}
private class ComponentImplRegistryReader extends RegistryReader {
@@ -261,9 +475,20 @@
* the registry is initialized in the constructor of this type, other threads cannot
* compete with readElement() for access to <i>descriptors</i>
*/
+
+ HashSet<String> setOfIds = new HashSet<String>();
+ setOfIds.add( element.getAttribute(ATT_TYPE) );
+
+ IConfigurationElement[] child = element.getChildren(EXTENDED_ELEMENT);
+ if( child.length > 0 ){
+ for( int i=0; i< child.length; i++ ){
+ setOfIds.add(child[i].getValue());
+ }
+ }
String type = element.getAttribute(ATT_TYPE);
if (type != null)
- descriptors.put(element.getAttribute(ATT_TYPE), new ComponentImplDescriptor(element));
+ descriptors.put(setOfIds, new ComponentImplDescriptor(element));
+ //descriptors.put(element.getAttribute(ATT_TYPE), new ComponentImplDescriptor(element));
else
ModulecorePlugin.logError(0, "No type attribute is specified for " + //$NON-NLS-1$
ModulecorePlugin.PLUGIN_ID + "." + COMPONENT_IMPL_EXTENSION_POINT + //$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
index cab5bf3..c6a83bb 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
@@ -31,10 +31,10 @@
import org.osgi.framework.Bundle;
public class ComponentResolver implements URIResolverExtension {
- private static boolean _DEBUG = "true".equals(Platform.getDebugOption("org.eclipse.wst.common.modulecore/ComponentResolver")); //$NON-NLS-1$ //$NON-NLS-2$
+ private static boolean _DEBUG = Boolean.valueOf(Platform.getDebugOption("org.eclipse.wst.common.modulecore/ComponentResolver")).booleanValue(); //$NON-NLS-1$
private static final String FILE_PROTOCOL = "file:///"; //$NON-NLS-1$
private static final String FILE_PROTOCOL2 = "file://"; //$NON-NLS-1$
- private static final String ROOT_PATH_STRING = Path.ROOT.toString(); //$NON-NLS-1$
+ private static final String ROOT_PATH_STRING = Path.ROOT.toString();
private static final String HTTP_PROTOCOL = "http:"; //$NON-NLS-1$
/**
@@ -107,7 +107,7 @@
/* Recompute the IFile, if needed, from the base location. */
if (file == null) {
- if (baseLocation == null || baseLocation.length() == 0) {
+ if (baseLocation == null || baseLocation.length() == 0 || baseLocation.startsWith("wbit:")) { //$NON-NLS-1$
/*
* We can't proceed if we lack both an IFile and a system
* reference
@@ -191,6 +191,7 @@
IPath resolvedRuntimePath = null;
if (systemId.startsWith(ROOT_PATH_STRING)) {
resolvedRuntimePath = new Path(systemId);
+ /* https://bugs.eclipse.org/284017 - ComponentResolver does not resolve absolute references to the context root */
if (resolvedRuntimePath.segmentCount() > 1 && resolvedRuntimePath.segment(0).equals(ComponentUtilities.getServerContextRoot(file.getProject()))) {
resolvedRuntimePath = resolvedRuntimePath.removeFirstSegments(1);
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
index 0ddeaf9..6150ada 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
@@ -115,7 +115,7 @@
public static IFile findFile(IVirtualComponent comp, IPath aPath) throws CoreException {
- if (comp == null || aPath == null)
+ if (comp == null || aPath == null || comp.isBinary())
return null;
IVirtualFolder root = comp.getRootFolder();
IVirtualResource file = root.findMember(aPath);
@@ -359,4 +359,5 @@
uri = reference.getRuntimePath() + "/" + reference.getReferencedComponent().getProject().getName() + extension; //$NON-NLS-1$
}
return uri;
- }}
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
index f556abc..e8c0cc4 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ComponentcoreSwitch.java,v 1.6 2005/10/18 22:27:18 cbridgha Exp $
+ * $Id: ComponentcoreSwitch.java,v 1.7 2009/06/09 20:02:03 jsholl Exp $
*/
package org.eclipse.wst.common.componentcore.internal.util;
@@ -74,13 +74,11 @@
if (theEClass.eContainer() == modelPackage) {
return doSwitch(theEClass.getClassifierID(), theEObject);
}
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
+ List eSuperTypes = theEClass.getESuperTypes();
+ return
+ eSuperTypes.isEmpty() ?
+ defaultCase(theEObject) :
+ doSwitch((EClass)eSuperTypes.get(0), theEObject);
}
/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/FacetedProjectUtilities.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/FacetedProjectUtilities.java
new file mode 100644
index 0000000..98263ca
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/FacetedProjectUtilities.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.util;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+
+public class FacetedProjectUtilities {
+ public static boolean isProjectOfType(IProject project, String typeID) {
+ return getProjectFacetVersion(project, typeID) != null;
+ }
+
+ public static IProjectFacetVersion getProjectFacetVersion(IProject project, String typeID){
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ return null;
+ }
+
+ if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ if(projectFacet == null){
+ return null;
+ }
+ return facetedProject.getProjectFacetVersion(projectFacet);
+ }
+ return null;
+ }
+
+ public static boolean isProjectOfType(IFacetedProject facetedProject, String typeID) {
+ if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
+ }
+ return false;
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/HRefTranslator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/HRefTranslator.java
index 8fba627..acb7c7e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/HRefTranslator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/HRefTranslator.java
@@ -28,36 +28,30 @@
public HRefTranslator(String domNameAndPath, EClass eClass) {
super(domNameAndPath, eClass);
- // TODO Auto-generated constructor stub
}
public HRefTranslator(String domNameAndPath, EStructuralFeature aFeature) {
super(domNameAndPath, aFeature);
- // TODO Auto-generated constructor stub
}
public HRefTranslator(String domNameAndPath, EStructuralFeature aFeature,
EClass eClass) {
super(domNameAndPath, aFeature, eClass);
- // TODO Auto-generated constructor stub
}
public HRefTranslator(String domNameAndPath, EStructuralFeature aFeature,
TranslatorPath path) {
super(domNameAndPath, aFeature, path);
- // TODO Auto-generated constructor stub
}
public HRefTranslator(String domNameAndPath, EStructuralFeature aFeature,
TranslatorPath[] paths) {
super(domNameAndPath, aFeature, paths);
- // TODO Auto-generated constructor stub
}
public HRefTranslator(String domNameAndPath, EStructuralFeature aFeature,
int style) {
super(domNameAndPath, aFeature, style);
- // TODO Auto-generated constructor stub
}
/*
* (non-Javadoc)
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/IModuleConstants.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/IModuleConstants.java
index f1c98d0..c93d9d7 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/IModuleConstants.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/IModuleConstants.java
@@ -39,6 +39,13 @@
public final static String JST_APPCLIENT_MODULE = "jst.appclient"; //$NON-NLS-1$
public final static String JST_CONNECTOR_MODULE = "jst.connector"; //$NON-NLS-1$
public final static String JST_JAVA = "jst.java"; //$NON-NLS-1$
+ public final static String JST_WEBFRAGMENT_MODULE = "jst.webfragment"; //$NON-NLS-1$
+
+ // Extensions
+ public final static String EAR_EXTENSION = ".ear"; //$NON-NLS-1$
+ public final static String WAR_EXTENSION = ".war"; //$NON-NLS-1$
+ public final static String RAR_EXTENSION = ".rar"; //$NON-NLS-1$
+ public final static String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
public final static String DEPENDENT_MODULE = "dependent"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/VirtualReferenceUtilities.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/VirtualReferenceUtilities.java
new file mode 100644
index 0000000..fe12b66
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/VirtualReferenceUtilities.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.internal.util;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+
+public class VirtualReferenceUtilities implements IModuleConstants {
+ public static VirtualReferenceUtilities INSTANCE = new VirtualReferenceUtilities();
+ private HashMap<String, String> mapping;
+ VirtualReferenceUtilities() {
+ mapping = new HashMap<String, String>();
+ mapping.put(JST_APPCLIENT_MODULE, JAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_WEB_MODULE, WAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_EJB_MODULE, JAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(WST_WEB_MODULE, WAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_EAR_MODULE, EAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_CONNECTOR_MODULE, RAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_UTILITY_MODULE, JAR_EXTENSION); //$NON-NLS-1$
+ mapping.put(JST_WEBFRAGMENT_MODULE, JAR_EXTENSION); //$NON-NLS-1$
+ }
+
+ /**
+ * Add a mapping for some facet type to some default extension
+ * @param facet
+ * @param extension
+ * @return
+ */
+ public boolean addDefaultExtension(String facet, String extension) {
+ if( !mapping.containsKey(facet)) {
+ if( ProjectFacetsManager.isProjectFacetDefined(facet)) {
+ mapping.put(facet, extension);
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * This is a utility method clients may or may not choose to make use of
+ * to ensure that all Project references have some archiveName associated with it.
+ */
+ public void ensureReferencesHaveNames(IVirtualReference[] refs) {
+ for( int i = 0; i < refs.length; i++ ) {
+ if( refs[i].getArchiveName() == null || refs[i].getArchiveName().equals("")) { //$NON-NLS-1$
+ refs[i].setArchiveName(getDefaultArchiveName(refs[i]));
+ }
+ }
+ }
+
+ /**
+ * return what the suggested archiveName is
+ * @param ref
+ * @return
+ */
+ public String getDefaultArchiveName(IVirtualReference ref) {
+ if( !ref.getReferencedComponent().isBinary()) {
+ return getDefaultProjectArchiveName(ref.getReferencedComponent());
+ }
+ // binary
+ return new Path(ref.getReferencedComponent().getDeployedName()).lastSegment();
+ }
+
+ public String getDefaultProjectArchiveName(IVirtualComponent component) {
+ Iterator<String> i = mapping.keySet().iterator();
+ String facet;
+ String name = (component.getDeployedName() == null ? component.getName() : component.getDeployedName());
+ while(i.hasNext()) {
+ facet = i.next();
+ if( FacetedProjectUtilities.isProjectOfType(component.getProject(), facet))
+ return name + mapping.get(facet);
+ }
+ return name + JAR_EXTENSION;
+ }
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
index 9ed9de9..6dd9ab3 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
@@ -32,6 +32,6 @@
String PROPERTY_VALUE = "value";//$NON-NLS-1$
String RESOURCE_TYPE = "resource-type";//$NON-NLS-1$
String ARCHIVE_NAME="archiveName";//$NON-NLS-1$
- String PROJECT_VERSION="project-version";
+ String PROJECT_VERSION="project-version"; //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
new file mode 100644
index 0000000..e8fcd73
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
@@ -0,0 +1,83 @@
+package org.eclipse.wst.common.componentcore.resolvers;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+import org.eclipse.wst.common.componentcore.internal.DependencyType;
+import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
+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;
+
+public class DefaultReferenceResolver implements IReferenceResolver {
+ // Does not need to implement,
+ // default is always called as last resort
+ public boolean canResolve(IVirtualComponent context,
+ ReferencedComponent referencedComponent) {
+ return false;
+ }
+
+ // Does not need to implement,
+ // default is always called as last resort
+ public boolean canResolve(IVirtualReference reference) {
+ return false;
+ }
+
+ public IVirtualReference resolve(IVirtualComponent context,
+ ReferencedComponent referencedComponent) {
+ IVirtualComponent targetComponent = null;
+ IProject targetProject = null;
+ URI uri = referencedComponent.getHandle();
+ if (uri == null)
+ return null;
+ boolean isClassPathURI = ModuleURIUtil.isClassPathURI(uri);
+ if( !isClassPathURI ){
+ try {
+ targetProject = StructureEdit.getContainingProject(uri);
+ } catch(UnresolveableURIException uurie) {
+ //Ignore
+ }
+ // if the project cannot be resolved, assume it's local - really it probably deleted
+
+ targetComponent = ComponentCore.createComponent(targetProject);
+
+
+ }else{
+ String archiveType = ""; //$NON-NLS-1$
+ String archiveName = ""; //$NON-NLS-1$
+ try {
+ archiveType = ModuleURIUtil.getArchiveType(uri);
+ archiveName = ModuleURIUtil.getArchiveName(uri);
+
+ } catch (UnresolveableURIException e) {
+ //Ignore
+ }
+ targetComponent = ComponentCore.createArchiveComponent(context.getProject(), archiveType + IPath.SEPARATOR + archiveName );
+ }
+ VirtualReference vRef = new VirtualReference(context, targetComponent, referencedComponent.getRuntimePath(), referencedComponent.getDependencyType().getValue());
+ vRef.setArchiveName(referencedComponent.getArchiveName());
+ return vRef;
+ }
+
+ public ReferencedComponent resolve(IVirtualReference reference) {
+ IVirtualComponent referencedComponent = reference.getReferencedComponent();
+ ReferencedComponent refComp = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent();
+ refComp.setRuntimePath(reference.getRuntimePath());
+ refComp.setDependencyType(DependencyType.get(reference.getDependencyType()));
+ refComp.setArchiveName(reference.getArchiveName());
+ if( referencedComponent != null ) {
+ if( !referencedComponent.isBinary())
+ refComp.setHandle(ModuleURIUtil.fullyQualifyURI(referencedComponent.getProject()));
+ else
+ refComp.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(referencedComponent.getName()));
+ }
+ return refComp;
+ }
+
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/IReferenceResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/IReferenceResolver.java
new file mode 100644
index 0000000..b1dcd00
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/IReferenceResolver.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.resolvers;
+
+import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+public interface IReferenceResolver {
+ public boolean canResolve(IVirtualComponent context, ReferencedComponent referencedComponent);
+ public IVirtualReference resolve(IVirtualComponent context, ReferencedComponent referencedComponent);
+ public boolean canResolve(IVirtualReference reference);
+ public ReferencedComponent resolve(IVirtualReference reference);
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/ReferenceResolverUtil.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/ReferenceResolverUtil.java
new file mode 100644
index 0000000..ec9d3f1
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/ReferenceResolverUtil.java
@@ -0,0 +1,126 @@
+package org.eclipse.wst.common.componentcore.resolvers;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import 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.wst.common.componentcore.internal.ModulecorePlugin;
+import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+public class ReferenceResolverUtil {
+ public static ReferenceResolverUtil instance = null;
+ public static ReferenceResolverUtil getDefault() {
+ if( instance == null )
+ instance = new ReferenceResolverUtil();
+ return instance;
+ }
+
+ private HashMap<String, ReferenceResolverWrapper> resolvers = null;
+ private ArrayList<IReferenceResolver> sorted = null;
+ private DefaultReferenceResolver defaultResolver = new DefaultReferenceResolver();
+ public IReferenceResolver[] getResolvers() {
+ if( resolvers == null || sorted == null)
+ loadResolvers();
+ if (sorted.isEmpty()) return new IReferenceResolver[0];
+ return (IReferenceResolver[]) sorted.toArray(new IReferenceResolver[sorted.size()]);
+ }
+
+ public IReferenceResolver getResolver(IVirtualComponent context, ReferencedComponent reference) {
+ getResolvers();
+ Iterator<IReferenceResolver> i = sorted.iterator();
+ IReferenceResolver resolver;
+ while(i.hasNext()) {
+ resolver = i.next();
+ if( resolver.canResolve(context, reference))
+ return resolver;
+ }
+ return defaultResolver;
+ }
+
+ public IReferenceResolver getResolver(IVirtualReference reference) {
+ getResolvers();
+ Iterator<IReferenceResolver> i = sorted.iterator();
+ IReferenceResolver resolver;
+ while(i.hasNext()) {
+ resolver = i.next();
+ if( resolver.canResolve(reference))
+ return resolver;
+ }
+ return defaultResolver;
+ }
+
+ protected void loadResolvers() {
+ HashMap<String, ReferenceResolverWrapper> map = new HashMap<String, ReferenceResolverWrapper>();
+
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IConfigurationElement[] cf = registry.getConfigurationElementsFor(ModulecorePlugin.PLUGIN_ID, "referenceResolver"); //$NON-NLS-1$
+ String id = null;
+ for( int j = 0; j < cf.length; j++ ) {
+ id = cf[j].getAttribute("id");
+ try {
+ map.put(id, new ReferenceResolverWrapper(
+ id, (IReferenceResolver)
+ cf[j].createExecutableExtension("class"),
+ cf[j].getAttribute("weight")));
+ } catch( CoreException ce ) {
+ // TODO figure it out
+ }
+ }
+
+ // Cache the sorted ones
+ List<ReferenceResolverWrapper> list = new ArrayList(map.values());
+ Comparator comparator = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ if( !(o1 instanceof ReferenceResolverWrapper))
+ return -1;
+ if( !(o2 instanceof ReferenceResolverWrapper))
+ return 1;
+ return ((ReferenceResolverWrapper)o2).getWeight()
+ - ((ReferenceResolverWrapper)o1).getWeight();
+ }
+ };
+
+ Collections.sort(list, comparator);
+ ArrayList<IReferenceResolver> sorted = new ArrayList<IReferenceResolver>();
+ Iterator i = list.iterator();
+ while(i.hasNext())
+ sorted.add(((ReferenceResolverWrapper)i.next()).getResolver());
+ this.sorted = sorted;
+ this.resolvers = map;
+ }
+
+
+ protected class ReferenceResolverWrapper {
+ private String id;
+ private IReferenceResolver resolver;
+ private int weight;
+ public ReferenceResolverWrapper(String id, IReferenceResolver resolver, String weight) {
+ this.id = id;
+ this.resolver = resolver;
+ try {
+ this.weight = Integer.parseInt(weight);
+ } catch( NumberFormatException nfe) {
+ this.weight = 1000;
+ }
+ }
+ public int getWeight() {
+ return weight;
+ }
+ public String getId() {
+ return id;
+ }
+ public IReferenceResolver getResolver() {
+ return resolver;
+ }
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
index 7de081d..69a1b5a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.common.componentcore.resources;
+import java.util.Map;
import java.util.Properties;
import org.eclipse.core.resources.IProject;
@@ -36,7 +37,15 @@
*/
public static final int BINARY = 0x1;
-
+ /**
+ * The key for the property of which reference types we're requesting
+ */
+ public static final String REQUESTED_REFERENCE_TYPE = "REQUESTED_REFERENCE_TYPE";
+ public static final String HARD_REFERENCES = "HARD_REFERENCES";
+ public static final String NON_DERIVED_REFERENCES = "NON_DERIVED_REFERENCES";
+ public static final String DISPLAYABLE_REFERENCES = "DISPLAYABLE_REFERENCES";
+ public static final String FLATTENABLE_REFERENCES = "FLATTENABLE_REFERENCES";
+
/**
* The name of the component must be unique within its enclosing project.
*
@@ -144,6 +153,19 @@
* @return A by-value copy of the virtual reference array
*/
IVirtualReference[] getReferences();
+
+ /**
+ * Virtual components may reference other virtual components to build logical dependency trees.
+ * <p>
+ * Each virtual reference will indicate how the content of the reference will be absorbed
+ * by this component. Each virtual reference will always specify an enclosing component that will
+ * be this component.
+ * </p>
+ * @param options A hashmap full of options
+ * @return
+ */
+ IVirtualReference[] getReferences(Map<String, Object> options);
+
/**
* Virtual components may reference other virtual components to build logical dependency trees.
* <p>
@@ -155,6 +177,8 @@
*/
IVirtualReference getReference(String aComponentName);
+
+
/**
* Virtual components may reference other virtual components to build logical dependency trees.
* <p>
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualReference.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualReference.java
index 6ef2274..b5c7c6b 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualReference.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualReference.java
@@ -107,4 +107,12 @@
*/
public void setArchiveName(String archiveName);
+ /**
+ * Is this reference a 'derived' reference? A derived reference
+ * is a reference that's not persisted in the primary model
+ * inside the org.eclipse.wst.component file.
+ *
+ * @return isDerived false if persisted, true otherwise
+ */
+ public boolean isDerived();
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/plugin.xml b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
index 569dd44..20573da 100644
--- a/plugins/org.eclipse.wst.common.modulecore/plugin.xml
+++ b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
@@ -34,7 +34,7 @@
</editModel>
</extension>
- <extension point="org.eclipse.core.runtime.contentTypes">
+ <extension point="org.eclipse.core.contenttype.contentTypes">
<file-association
content-type="org.eclipse.core.runtime.xml"
file-names="org.eclipse.wst.common.component"/>
@@ -55,6 +55,7 @@
<extension-point id="artifactedit" name="Component Artifact Edit" schema="schema/artifactedit.exsd"/>
<extension-point id="componentimpl" name="componentimpl" schema="schema/componentimpl.exsd"/>
<extension-point id="resourceFactories" name="Resource Factory Association (Internal)" schema="schema/resourceFactories.exsd"/>
+ <extension-point id="referenceResolver" name="referenceResolver" schema="schema/referenceResolver.exsd"/>
<!-- Contribute a URIResolverExtension for flexible projects -->
<extension point="org.eclipse.wst.common.uriresolver.resolverExtensions">
@@ -74,63 +75,6 @@
</factory>
</extension>
- <extension
- id="ModuleCoreValidator"
- name="%Validator.name"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- caseSensitive="false"
- nameFilter="*.wtpmodules">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- caseSensitive="false"
- nameFilter="*.component">
- </filter>
- <markerId
- markerIdValue="ModuleCoreValidatorMarker">
- </markerId>
- <helper
- class="org.eclipse.wst.common.componentcore.internal.ModuleCoreValidatorHelper">
- </helper>
- <run
- class="org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator">
- </run>
- </validator>
- </extension>
-
-<extension
- id="ModuleCoreValidatorMarker"
- name="%ValidationMarker.name"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.wst.validation.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
-</extension>
-
<!-- Register the nature id with the EMFNature -->
<extension
point="org.eclipse.jem.util.nature_registration">
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
index 507ed10..edaf17f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/ComponentProjectMigrator.exsd
@@ -1,16 +1,25 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.modulecore">
+<schema targetNamespace="org.eclipse.wst.common.modulecore" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.wst.common.modulecore" id="ComponentProjectMigrator" name="Component Project Migrator"/>
</appInfo>
<documentation>
- This allows specific implementations of components to contribute migrators Those plugins have dependencies on the modulecore plugin, but not vice versa. In order for code defined within the modulecore plugin to execute these actions, we need this extension point.
+ This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+@deprecated
+
+This allows specific implementations of components to contribute migrators Those plugins have dependencies on the modulecore plugin, but not vice versa. In order for code defined within the modulecore plugin to execute these actions, we need this extension point.
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="migratorExtension"/>
@@ -53,10 +62,27 @@
<annotation>
<appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+ This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+@deprecated
+
+ </documentation>
+ </annotation>
+
+ <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>
+ This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+@deprecated
+
+
+<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>
@@ -65,16 +91,10 @@
<meta.section type="examples"/>
</appInfo>
<documentation>
-
- </documentation>
- </annotation>
+ This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+@deprecated
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
</documentation>
</annotation>
@@ -83,7 +103,10 @@
<meta.section type="implementation"/>
</appInfo>
<documentation>
-
+ This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
+@deprecated
+
</documentation>
</annotation>
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/componentCore.xsd b/plugins/org.eclipse.wst.common.modulecore/schema/componentCore.xsd
index a2d8828..f6c87e9 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/componentCore.xsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/componentCore.xsd
@@ -31,6 +31,9 @@
<attribute name="handle"
type="string" use="required">
</attribute>
+ <attribute name="archiveName"
+ type="string" use="optional">
+ </attribute>
<attribute name="deploy-path"
type="string" use="required">
</attribute>
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/componentimpl.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/componentimpl.exsd
index 667317e..828b78e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/componentimpl.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/componentimpl.exsd
@@ -2,15 +2,20 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.wst.common.modulecore" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appinfo>
+ <appInfo>
<meta.schema plugin="org.eclipse.wst.common.modulecore" id="componentimpl" name="componentimpl"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
</sequence>
@@ -33,9 +38,9 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute translatable="true"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
@@ -43,6 +48,9 @@
<element name="componentimpl">
<complexType>
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <element ref="extendedTypeID" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
<attribute name="typeID" type="string" use="required">
<annotation>
<documentation>
@@ -55,46 +63,48 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute kind="java" basedOn=":org.eclipse.wst.common.componentcore.resources.IVirtualComponent"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
</element>
+ <element name="extendedTypeID" type="string">
+ </element>
+
<annotation>
- <appinfo>
+ <appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
<meta.section type="since"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="examples"/>
- </appinfo>
+ </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>
+ <appInfo>
<meta.section type="implementation"/>
- </appinfo>
+ </appInfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/referenceResolver.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/referenceResolver.exsd
new file mode 100644
index 0000000..8ed7a92
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/referenceResolver.exsd
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.common.modulecore" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.wst.common.modulecore" id="referenceResolver" name="referenceResolver"/>
+ </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="resolver"/>
+ </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="resolver">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ A required id which can be used to reference this resolver
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+ The implementation class of this extension
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="weight" type="string">
+ <annotation>
+ <documentation>
+ The weight used for sorting the resolvers. Lighter weights float to the top and are tried first.
+ </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.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 6e0dd26..0000000
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +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.4.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)"
-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.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 af8e823..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
+++ /dev/null
@@ -1,158 +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
-###############################################################################
-# *************************************************************************
-# * 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=Enable All
-PREF_BUTTON_DISABLEALL=Disable 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=Suspend all validators
-
-DelegatesDialogTitle=Validator Preferences
-DelegatesComboLabel=Implementation:
-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 Rule...
-ButtonRemove=Remove
-
-LabelEnableProjectSpecific=Enable project specific settings
-
-LabelExtension=File extension
-LabelFile=Folder or file name
-LabelProjects=Project nature
-LabelFacets=Facet
-LabelContentType=Content Type
-
-# 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.
-
-ErrorsWarnings=Errors/Warnings
-
-Validation=Validation
-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=File or folder:
-FrBrowseFile=Browse File...
-FrFileFilter=Select the file that will serve as the filter
-FrBrowseFolder=Browse Folder...
-FrFolderFilter=Select the folder that will serve as the filter
-FrProjectNature=Project Nature
-FrProjectNatureLabel=Project nature:
-FrFacit=Facet
-FrFacitLabel=Facet id:
-FrContentType=Content Type
-FrContentTypeLabel=Content Type:
-FrMsgSev=Select the severity level for the following problems
-
-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 99da9b9..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.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 DescExtension;
- public static String DescFile;
- public static String DescProjects;
- public static String DescFacets;
- public static String DescContentType;
-
- 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 FrContentTypeLabel;
- public static String FrMsgSev;
-
- 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 fad49d7..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-import java.util.Map;
-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.validation.internal.model.FilterRule;
-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 && selectedFilter == 2)selectedFilter = 4;
- 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;
- }
- 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};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescContentType};
- }
- else {
- labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
- ValUIMessages.LabelProjects, ValUIMessages.LabelFacets,
- ValUIMessages.LabelContentType};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescProjects, ValUIMessages.DescFacets,
- ValUIMessages.DescContentType};
- }
-
- 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 Label(control, SWT.WRAP)).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.NONE);
- _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.NONE);
- _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];
- for (int i=0; i<pn.length; i++){
- _ids[i] = pn[i].getNatureId();
- items[i] = pn[i].getLabel() + " - " + _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 Text _pattern;
-
- 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.FrFacitLabel);
- _pattern = new Text(control, SWT.NONE);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- FilterRule rule = FilterRule.createFacet(_pattern.getText());
- 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 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();
- _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;
- }
-
- }
-
- 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 30e1556..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,844 +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.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);
-
- // Have to set the tab order or only the first checkbox in a
- // Composite can be tabbed to. (Seems to apply only to checkboxes. Have to use the
- // arrow key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[] { _suspend, _autoSave,
- _validatorsTable, _enableAllButton, _disableAllButton });
-
- 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 9aabee4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
+++ /dev/null
@@ -1,872 +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.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);
- 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);
-
- // Have to set the tab order or only the first checkbox in a
- // Composite can be tabbed to. (Seems to apply only to checkboxes. Have to use the
- // arrow key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[] { _override, _suspend});
-
- 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();
- }
- });
- }
-
- 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;
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/.classpath b/plugins/org.eclipse.wst.validation/.classpath
deleted file mode 100644
index 64ae09a..0000000
--- a/plugins/org.eclipse.wst.validation/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validate"/>
- <classpathentry kind="src" path="validate_core"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="src" path="vf2"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.validation/.cvsignore b/plugins/org.eclipse.wst.validation/.cvsignore
deleted file mode 100644
index e936909..0000000
--- a/plugins/org.eclipse.wst.validation/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-bin
-temp.folder
-validate.jar
-build.xml
-common.jar
-validatesrc.zip
-commonsrc.zip
-src.zip
-org.eclipse.wst.validation_1.0.0.zip
-@dot
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.validation/.options b/plugins/org.eclipse.wst.validation/.options
deleted file mode 100644
index 404c71b..0000000
--- a/plugins/org.eclipse.wst.validation/.options
+++ /dev/null
@@ -1,37 +0,0 @@
-org.eclipse.wst.validation/debug=true
-
-# Set this to true if you wish performance information to be logged
-org.eclipse.wst.validation/timings=false
-
-# set this to true if you want version 1 validator tracing
-org.eclipse.wst.validation/v1=false
-
-# Set this to a file name, if you wish the results to be logged to a file, otherwise
-# they will be written to stderr. When logged to a file the results are in a
-# CSV (comma separated values) form. When logged to stderr they are in a more
-# human readable form.
-org.eclipse.wst.validation/timings/tracefile=
-
-# By default times that are written to the trace file are in milliseconds for elapsed
-# time and nanoseconds for cpu time. If you find these times easier to read as seconds
-# as expressed by a double, the following flag can be turned on.
-org.eclipse.wst.validation/timings/useDoubles=false
-
-# If extra detail is needed for a particular validator it's id can be specified here.
-# For example, if you wanted more detail on the XML validator you would use
-# org.eclipse.wst.xml.core.xml
-org.eclipse.wst.validation/extraValDetail=
-
-# To make debugging easier, you can make it appear is if only one validator has been
-# registered via the extension points. You do this by setting the following filter
-# to validator id of the one validator that you want registered.
-#
-# As an example, you could use this plug-in id for a v1 validator: org.eclipse.jst.j2ee.ejb.EJBValidator
-# and org.eclipse.wst.html.ui.HTMLValidator for a v2 validator
-org.eclipse.wst.validation/filter/allExcept=
-
-# The tracing level. If not supplied a default of zero is used. The higher the number the
-# more verbose the tracing.
-org.eclipse.wst.validation/trace/level=
-
-
diff --git a/plugins/org.eclipse.wst.validation/.project b/plugins/org.eclipse.wst.validation/.project
deleted file mode 100644
index 846dae7..0000000
--- a/plugins/org.eclipse.wst.validation/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation</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/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 58507dd..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,78 +0,0 @@
-#Fri Apr 11 07:15:44 EDT 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=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=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.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=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=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 76ddc11..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Jun 11 14:58:22 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index dd1631f..0000000
--- a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.validation; singleton:=true
-Bundle-Version: 1.2.11.qualifier
-Bundle-Activator: org.eclipse.wst.validation.internal.plugin.ValidationPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation,
- org.eclipse.wst.validation.internal;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.core;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.delegates;x-internal:=true,
- org.eclipse.wst.validation.internal.model;x-internal:=true,
- org.eclipse.wst.validation.internal.operations;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.plugin;x-friends:="org.eclipse.wst.common.tests.validation",
- org.eclipse.wst.validation.internal.provisional;x-internal:=true,
- org.eclipse.wst.validation.internal.provisional.core
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.validation/about.html b/plugins/org.eclipse.wst.validation/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.validation/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/build.properties b/plugins/org.eclipse.wst.validation/build.properties
deleted file mode 100644
index 167d165..0000000
--- a/plugins/org.eclipse.wst.validation/build.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .,\
- .options,\
- xsds/
-jars.compile.order = .
-src.includes = component.xml,\
- xsds/
-output.. = bin/
-source.. = validate_core/,\
- property_files/,\
- validate/,\
- vf2/
diff --git a/plugins/org.eclipse.wst.validation/component.xml b/plugins/org.eclipse.wst.validation/component.xml
deleted file mode 100644
index 21011d7..0000000
--- a/plugins/org.eclipse.wst.validation/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.validation"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.validation" fragment="false"/><plugin id="org.eclipse.wst.validation.ui" fragment="false"/><package name="org.eclipse.wst.validation.core"></package><package name="org.eclipse.wst.validation.plugin"></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/plugin.properties b/plugins/org.eclipse.wst.validation/plugin.properties
deleted file mode 100644
index d7722e4..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-
-VALIDATION_BUILDER_NAME=Validation
-VALIDATION_PROBLEMMARKER_NAME=Validation Message
-ProblemMarkerV2=Validation Message
-
-VALIDATION_PROJECTMARKER_NAME=Enabled Validators
-VALIDATION_PREFERENCEMARKER_NAME=Validation Preferences
-Validator=Validator
-ReferencialFileValidator=ReferencialFileValidator
-validationSelectionHandler=validationSelectionHandler
-ValidatorDelegates=Validator Delegates
-
-Bundle-Name.0 = Validation Framework
-Bundle-Vendor.0 = Eclipse.org
-
-Extension.validator=Validator (Version 2)
diff --git a/plugins/org.eclipse.wst.validation/plugin.xml b/plugins/org.eclipse.wst.validation/plugin.xml
deleted file mode 100644
index 1b17568..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!-- Validation extension points -->
- <extension-point id="validator" name="%Validator" schema="xsds/validatorExtSchema.exsd"/>
- <extension-point id="validatorV2" name="%Extension.validator" schema="xsds/validator.exsd"/>
- <extension-point id="referencialFileValidator" name="%ReferencialFileValidator" schema="xsds/referencialFileExtSchema.exsd"/>
- <extension-point id="validationSelectionHandler" name="%validationSelectionHandler" schema="xsds/validationSelectionHandler.exsd"/>
- <extension-point id="validationHelper" name="validationHelper" schema="xsds/validationHelper.exsd"/>
- <extension-point id="validatorDelegates" name="%ValidatorDelegates" schema="xsds/validatorDelegates.exsd"/>
- <extension-point id="validatorGroup" name="Validator Group" schema="xsds/validatorgroup.exsd"/>
- <extension-point id="exclude" name="Validator Exclusions" schema="xsds/exclude.exsd"/>
-
-<!--============================-->
-<!-- Validation Contributions -->
-<!--============================-->
- <extension
- id="validationbuilder"
- name="%VALIDATION_BUILDER_NAME"
- point="org.eclipse.core.resources.builders">
- <builder>
- <run
- class="org.eclipse.wst.validation.internal.operations.ValidationBuilder">
- </run>
- </builder>
- </extension>
-<!-- Problem markers must be a subtype of problemmarker to be displayed in the task view -->
- <extension
- id="problemmarker"
- name="%VALIDATION_PROBLEMMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
- </extension>
-<!-- Don't want to display this marker in the task view -->
- <extension
- id="projectmarker"
- name="%VALIDATION_PROJECTMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.textmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="enabledValidatorList">
- </attribute>
- <attribute
- name="autoValidate">
- </attribute>
- <attribute
- name="runWhenBuild">
- </attribute>
- <attribute
- name="maxNumMessages">
- </attribute>
- <attribute
- name="overrideGlobalPreferences">
- </attribute>
- <attribute
- name="version">
- </attribute>
- </extension>
-<!-- Don't want to display this marker in the task view -->
- <extension
- id="preferencemarker"
- name="%VALIDATION_PREFERENCEMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.textmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="enabledValidatorList">
- </attribute>
- <attribute
- name="autoValidate">
- </attribute>
- <attribute
- name="runWhenBuild">
- </attribute>
- <attribute
- name="maxNumMessages">
- </attribute>
- <attribute
- name="projectsCanOverride">
- </attribute>
- <attribute
- name="version">
- </attribute>
- </extension>
- <!-- GRK - I added a new problem marker so that we can keep the v2 changes separate from the v1 framework. -->
- <extension
- id="problemmarker2"
- name="%ProblemMarkerV2"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
deleted file mode 100644
index a5062b8..0000000
--- a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ErrConfig=IWAE0100E Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
-ErrGroupName=IWAE0101E Invalid element, expect either the element "include" or "exclude".
-ErrFilterRule=IWAE0102E An invalid filter rule has been encountered.
-
-ErrGroupNoType=IWAE0103E Groups must have a valid type, no type was returned
-ErrGroupInvalidType=IWAE0104E Groups must have a valid type, the following invalid type was returned: {0}
-ErrDependencyVersion=IWAE0105E Only version {0} is supported
-
-ErrPatternAttrib=IWAE0106E The pattern attribute must be supplied
-ErrTypeReq=IWAE0107E Type is a required attribute for file filters
-
-VbfExcSyntaxNoValClass=IWAE0016E Validator cannot be created because no "class" attribute is specified in the <run> element of the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
-VbfExcSyntaxNoValRun=IWAE0015E Validator cannot be created because no <run> element is specified in the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
-VbfExcSyntaxNoValNull=IWAE0018E Validator class {0} could not be created. IConfigurationElement.createExecutableExtension(String) returned null.
-
-ErrType=The value of the type attribute is incorrect. It was specified as {0} but the only valid values are: {1}, {2}, {3}
-ConfigError=It appears that validator {0} (with id {1}) has been configured incorrectly, it produced {2} messages while validating {3}. It has been disabled. Try restoring the defaults for this validator.
-
-DecodeError1=IWAE0019E There was a problem deserializing a string. A boolean was expected but not found.
-Error20=IWAE0020E Internal error, the incoming validator must be a v2 validator
-GroupInclude=Include Group
-GroupExclude=Exclude Group
-
-TypeInclude=include
-TypeExclude=exclude
-
-JobName=Validation
-JobNameMonitor=Validation Monitor
-JobIndexSave=Index Save
-
-MigrationJobName=Validation Setup
-
-RuleProjectNature=Project nature
-RuleFileExt=File extension
-RuleFile=File
-RuleContentType=Content Type
-RuleFacet=Facet
-RuleFolder=Folder
-RuleFull=Qualified File
-
-FileExtWithCase={0}: {1} (case sensitive)
-FileExtWithoutCase={0}: {1}
-
-ContentTypeExact={0}: {1} (excludes subtypes)
-ContentTypeNotExact={0}: {1} (includes subtypes)
-
-LogValStart=Validator {0} starting to validate: {1}
-LogValEnd=Validator {0} finished validating: {1}
-LogValEndTime=Validator {0} with id {1} finished validating: {2} in {3}
-LogValSummary=Validator {0} with id {1} validated {2} resources in {3}
-LogValSummary2=Validator {0} with id {1} validated {2} resources in {3} using {4} of CPU time
-LogSession=Session started on: {0}
-
-SevError=Error
-SevWarning=Warning
-SevIgnore=Ignore
-
-TimeUnder=under a second
-TimeNano={0} nanoseconds
-TimeMicro={0} microseconds
-TimeSec={0} seconds
-TimeMin={0} minutes
-
diff --git a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
deleted file mode 100644
index 9e2583d..0000000
--- a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
+++ /dev/null
@@ -1,140 +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
-###############################################################################
-# To avoid name collisions, each extension point should preface their property names with an identifier.
-#
-# *************************************************************************
-# * 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.14
-#
-#
-# ID:
-# VBF - Validation Builder Framework
-# VBF_EXC=Exception or error text
-# VBF_STATUS=Status message
-# VBF_TASK=Task list message
-#
-
-#
-# Begin Validation Builder Framework Strings
-#
-# IDs:
-# VBF_EXC=Exception or error text
-# VBF_STATUS=Status message
-# VBF_TASK=Task list message
-#
-VBF_EXC_CANNOT_ADD_MARKER=IWAE0001E The marker cannot be added to resource {0} in the task list.
-VBF_EXC_CANNOT_REMOVE_MARKER=IWAE0002E The marker cannot be removed from resource {0} in the task list.
-
-VBF_EXC_HELPER_MISSING=IWAE0003E Unable to load {0} because it did not specify a <helper>. Each validator must identify the helper class that loads its MOF model.
-VBF_EXC_HELPER_CANNOTLOAD=IWAE0004E Unable to load {0} because its <helper>, {1}, could not be loaded. Ensure that the case-sensitive file name is spelled correctly.
-
-VBF_EXC_INTERNAL=IWAE0005E An internal error occurred during validation. Validation was being run on project {0} with validator {1}. The message thrown was {2}.
-
-# 2TC: In the following string, "type" is a noun
-VBF_EXC_INVALID_TYPE_FILTER=IWAE0006E Invalid type filter; {0} must be an instance of {1}.
-VBF_EXC_INVALID_RESOURCE=IWAE0007E Cannot add message "{0}" with target object "{1}" because no file, folder, or project can be found with which to associate the message.
-
-VBF_EXC_MISSING_VALIDATOR_EP=IWAE0008E The validator framework could not be started. The extension point named \"{0}\" could not be found. Save all log files and contact your IBM representative.
-VBF_EXC_MISSING_PROJECTNATURE_ID=IWAE0009E A projectNature must have an associated ID. Validation is ignoring this tag and continuing.
-
-VBF_EXC_RUNTIME=IWAE0010E Run-time exception {0} occurred during validation. The validator being run was {1} and the message thrown was {2}.
-
-VBF_EXC_SYNTAX_NO_HELPER=IWAE0012E No <helper> element is specified in the plugin.xml file for validator {0}. Since the helper cannot be created, the validator will not be loaded.
-VBF_EXC_SYNTAX_NO_HELPER_CLASS=IWAE0013E No "class" attribute in the <helper> element is specified in the plugin.xml file for validator {0}. The helper cannot be created without the name of the class that implements it. Since the helper cannot be created, the validator will not be loaded.
-VBF_EXC_SYNTAX_NO_HELPER_THROWABLE=IWAE0014E The helper {0} cannot be created because a Throwable was caught.
-VBF_EXC_SYNTAX_NO_VAL_THROWABLE=IWAE0017E Cannot create validator {0} because a Throwable was caught.
-
-VBF_EXC_DISABLEV=IWAE0019E Cannot instantiate validator {0}. Disabling the validator; read the log for details.
-VBF_EXC_DISABLEH=IWAE0020E Cannot instantiate helper {0}. Disabling validator {1}; read the log for details.
-VBF_EXC_ORPHAN_IVALIDATOR=IWAE0021E Cannot locate meta-data for validator {0}.
-
-VBF_EXC_VALIDATORNAME_IS_NULL=IWAE0022E The plugin with ID {0} has been disabled because its getName() method returns null. The method must return a value.
-
-VBF_EXC_NULLCREATE=IWAE0023E Cannot create a validation configuration on a null resource.
-VBF_EXC_NULLSAVE=IWAE0024E Cannot save a validation configuration on a null resource.
-VBF_EXC_SAVE=IWAE0025E Could not save the validation configuration on resource {0}.
-VBF_EXC_NULLRETRIEVE=IWAE0026E Cannot retrieve the validation configuration because resource is null.
-VBF_EXC_RETRIEVE=IWAE0027E Could not retrieve the validation configuration for resource {0}.
-
-VBF_EXC_BADVMD=IWAE0028E ValidatorMetaData[] must not be null or empty.
-VBF_EXC_OPENPRJ=IWAE0029E Project {0} must be open.
-VBF_EXC_EXISTPRJ=IWAE0030E Project {0} must exist.
-VBF_EXC_BADPRJ=IWAE0031E Project {0} must be the project that contains the resources in the IResource[].
-VBF_EXC_MULTIPRJ=IWAE0032E All IResource instances in the IResource[] must be part of the same IProject instance. The resources come from the following projects: {0}.
-VBF_EXC_BADVAL=IWAE0033E Validator {0} must be configured on {1};
-
-VBF_STATUS_INITIALIZING=Initializing {0}.
-
-VBF_STATUS_VALIDATOR_CLEANUP=Performing cleanup on {0} before termination.
-
-VBF_STATUS_PROGRESSMONITOR_TITLE=Validating
-VBF_STATUS_NULL_DELTA=Last build state of {0} could not be retrieved. Performing a full validation.
-
-VBF_STATUS_VALIDATOR_TERMINATED=Validation of {0} using {1} was cancelled.
-
-VBF_STATUS_START_REMOVING_OLD_MESSAGES=Removing {0} messages on {1} has started...
-VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES=Messages removed.
-
-VBF_STATUS_STARTING_VALIDATION=Validation of {0} by {1} has started...
-VBF_STATUS_ENDING_VALIDATION=Validation of {0} by {1} is complete. All known problems have been reported.
-VBF_STATUS_ENDING_VALIDATION_ABNORMALLY=Validation of {0} by {1} ended abnormally. The list of problems may be incomplete. Please check the information messages for the cause of the abnormal termination.
-
-VBF_STATUS_LOOKING=Looking for validation messages owned by uninstalled validators...
-VBF_STATUS_LOOKINGDONE=Looking for validation messages owned by uninstalled validators...done.
-VBF_STATUS_REMOVING=Removing validation messages owned by uninstalled validators...
-VBF_STATUS_REMOVINGDONE=Removing validation messages owned by uninstalled validators...done.
-
-VBF_WRONG_CONTEXT_FOR_DELEGATE=The validator {0} is a being invoked with a wrong context. Please use an IProjectValidationContext.
-VBF_NO_DELEGATE=The validator {0} is a delegating validator but no delegate can found for it.
-VBF_CANNOT_INSTANTIATE_DELEGATE=The validator delegate {0} registered for {1} cannot be instantiated.
-
-# The following message will be deleted soon.
-VBF_TASK_WARN_MESSAGE_LIMIT_ABORT=IWAE0034W IWAD3000I: {1} terminated validation of {0} because the maximum number of messages were reported. Some messages may be missing.
-
-VBF_TASK_WARN_MESSAGE_LIMIT_VAL=IWAE0035W IWAD3000I: Some messages may be missing because the maximum number of messages has been reported. Increase the maximum number of messages and try again.
-VBF_VALIDATION_JOB_MSG=Waiting for build
-
-#
-# End Validation Builder Framework Strings
-#
-
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
deleted file mode 100644
index 16aef08..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
+++ /dev/null
@@ -1,86 +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;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Validation constants needed to implement the marker extension point and the user's preferences.
- *
- * Only the validation framework should use this interface.
- */
-public interface ConfigurationConstants {
- String DISABLE_ALL_VALIDATION_SETTING = "disableAllValidation"; //$NON-NLS-1$ // boolean
- String SAVE_AUTOMATICALLY_SETTING = "saveAutomatically"; //$NON-NLS-1$ // boolean
-
- // Defaults for the preference and project values
-
- String CURRENT_VERSION = (String) ValidationPlugin.getPlugin().getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); // this is a constant, so it should be intern
- boolean DEFAULT_ASYNC = true;
- boolean DEFAULT_DISABLE_VALIDATION_SETTING = false;
- ValidatorMetaData[] DEFAULT_ENABLED_VALIDATORS = ValidationRegistryReader.getReader().getValidatorMetaDataArrayEnabledByDefault(); // store a copy here so that we don't modify the original and don't create a copy every time we need this value
- int DEFAULT_MAXNUMMESSAGES = 50;
- int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
- int DEPTH_ZERO = IResource.DEPTH_ZERO;
- String ELEMENT_SEPARATOR = ";"; //$NON-NLS-1$ // separates the name of one IValidator from the next in the list of enabled validators for a project or preference
- String DELEGATES_SEPARATOR = "="; //$NON-NLS-1$ // Separates the delegating validator id from the delegate validator id in the list of delegates
-
- // The following values must match the attributes in the preference marker as shown in plugin.xml
- // Even though the plugin.xml values are not used to create new Preference or Project markers,
- // maintaining one local name ensures that there's no confusion writing the migration code.
- // These are the QualifiedNames used to persist the user's settings.
- String ENABLED_MANUAL_VALIDATORS = "enabledManualValidatorList"; //$NON-NLS-1$ // String
- String ENABLED_BUILD_VALIDATORS = "enabledBuildValidatorList"; //$NON-NLS-1$ // String
- String DELEGATE_VALIDATORS = "delegateValidatorList"; //$NON-NLS-1$ // String
- String J2EE_PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$ // For 4.03, this is the plugin id that the validation constants were declared in.
- String MAXNUMMESSAGES = "maxNumMessages"; //$NON-NLS-1$ // integer
- String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
- String PREF_PROJECTS_CAN_OVERRIDE = "projectsCanOverride"; //$NON-NLS-1$ // boolean
- // end validation message marker constants
-
- // Preference and Project constants
- String PREFERENCE_MARKER = PLUGIN_ID + ".preferencemarker"; //$NON-NLS-1$
- String PRJ_MARKER = PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
- String PRJ_MARKER_403 = J2EE_PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
- String PRJ_OVERRIDEGLOBAL = "overrideGlobalPreferences"; //$NON-NLS-1$ // boolean (Use the global preferences or override)
-
- QualifiedName USER_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName USER_MANUAL_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationManualConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName USER_BUILD_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationBuildConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
- QualifiedName DELEGATES_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationDelegatesConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
-
- // Validation message marker constants
-
- /**
- * org.eclipse.wst.validation.problemmarker - The marker id which is used to add v1 validation markers
- * to the task list */
- String VALIDATION_MARKER = PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$
-
- /** For incremental validation, this field associates a message with a group, so that a subset of messages may be removed from a file. */
- String VALIDATION_MARKER_GROUP = "groupName"; //$NON-NLS-1$
-
- /** Persist the message id of the message, not just the translated text. */
- String VALIDATION_MARKER_MESSAGEID = "messageId"; //$NON-NLS-1$
-
- // The following values must match the attributes in the validation message marker as shown in plugin.xml
- String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$ // The IValidator who owns the IMarker on the task list
- String VALIDATION_MARKER_SEVERITY = "validationSeverity"; //$NON-NLS-1$ // one of the SeverityEnum values
- String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$ // When more than one target object resolves to the same IResource, this field identifies which targetObject owns a particular message.
- String VERSION = "version"; //$NON-NLS-1$
-
- // WSAD versions which created markers of these types
- String VERSION4_03 = "4.03"; //$NON-NLS-1$
- String VERSION5_0 = "5.0"; //$NON-NLS-1$
- String VERSION5_01 = "5.0.1"; //$NON-NLS-1$
- // end preference and project defaults
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
deleted file mode 100644
index 47e919c..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
+++ /dev/null
@@ -1,256 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Only the validation framework can use this class.
- */
-public final class ConfigurationManager implements ConfigurationConstants {
- private static ConfigurationManager _instance = null;
-
- private ConfigurationManager() {}
-
- public static ConfigurationManager getManager() {
- if (_instance == null) {
- _instance = new ConfigurationManager();
- }
- return _instance;
- }
-
- /**
- * Given a validation marker, return the fully-qualified class name of the validator who owns
- * the message. If the validator cannot be found or if the marker is not a validation marker,
- * return null.
- */
- public String getValidator(IMarker marker) {
- if (marker == null)return null;
-
- try {
- if (!marker.getType().equals(VALIDATION_MARKER))return null;
-
- Object attrib = marker.getAttribute(VALIDATION_MARKER_OWNER);
- if (attrib == null)return null;
- return attrib.toString();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- /**
- * Return true if the given marker is a validation marker. Otherwise return false.
- */
- public boolean isValidationMarker(IMarker marker) {
- if (marker == null)return false;
-
- try {
- return marker.getType().equals(VALIDATION_MARKER);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return false;
- }
- }
-
- /**
- * This method is for use by the TVT Validation plug-in ONLY!!! No code should access the
- * validation markers in the list directly except for the validation framework and the TVT
- * Validation plug-in.
- */
- public void removeAllValidationMarkers(IProject project) {
- if ((project == null) || (!project.isOpen()))return;
-
- try {
- project.deleteMarkers(VALIDATION_MARKER, false, DEPTH_INFINITE); // false means only
- // consider VALIDATION_MARKER, not variants of VALIDATION_MARKER.
- //Since addTask only adds VALIDATION_MARKER, we don't need to consider its subtypes.
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * This method returns the global preferences for the workspace.
- */
- public GlobalConfiguration getGlobalConfiguration() throws InvocationTargetException {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- GlobalConfiguration gp = null;
- try {
- gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp == null)gp = getGlobalConfiguration(root);
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
- }
- return gp;
- }
-
- private synchronized GlobalConfiguration getGlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
- GlobalConfiguration gp = null;
- try {
- gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp == null) {
- gp = new GlobalConfiguration(root);
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
-// prefs.addPropertyChangeListener(gp);
-
- gp.getVersion(); // initialize the configuration's version attribute
- gp.load(); // initialize this instance from the stored values
- gp.passivate(); // store this instance as a property on the IResource
- }
- return gp;
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
- }
- }
-
- public ProjectConfiguration getProjectConfiguration(IProject project) throws InvocationTargetException {
- ProjectConfiguration prjp = null;
- try {
- prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
- if (prjp == null || !prjp.getResource().exists()) {
- prjp = new ProjectConfiguration(project);
- prjp.getVersion(); // initialize the configuration's version attribute
- prjp.load(); // initialize this instance from the stored values
- prjp.passivate(); // store this instance as a property on the IResource
- }
- return prjp;
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
- }
- }
-
- public ProjectConfiguration getProjectConfigurationWithoutMigrate(IProject project) throws InvocationTargetException {
- ProjectConfiguration prjp = null;
- try {
- prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
- if (prjp == null || !prjp.getResource().exists()) {
- prjp = new ProjectConfiguration(project);
- prjp.getVersion(); // initialize the configuration's version attribute
- prjp.load(); // initialize this instance from the stored values
- prjp.passivate(); // store this instance as a property on the IResource
- }
- return prjp;
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
- }
- }
-
-
- /**
- * The nature of the project has changed; update the enabled validators on the project.
- *
- * @deprecated this method doesn't do anything.
- */
- public void resetProjectNature(IProject project) throws InvocationTargetException {
- }
-
- public void closing(IProject project) {
- try {
- if (isMigrated(project)) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if(!prjp.useGlobalPreference())prjp.store();
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- /**
- * @deprecated this method does not do anything.
- * @param project
- */
- public void deleting(IProject project) {
- }
-
- /**
- * @deprecated this method does not do anything.
- * @param project
- */
- public void opening(IProject project) {
- // Do not load or migrate the project in this method; let the getConfiguration(IProject)
- // method do that. Do not load the project before it's necessary.
- }
-
- /**
- * Return true if the global preferences are at the current level of metadata, false otherwise.
- */
- public boolean isGlobalMigrated() throws InvocationTargetException {
- IWorkspaceRoot root = ValidationConfiguration.getRoot();
- if (root == null)return false;
-
- try {
- GlobalConfiguration gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp != null) {
- return gp.isVersionCurrent();
- }
-
- String serializedPrjp = root.getPersistentProperty(USER_PREFERENCE);
- if (serializedPrjp != null) {
- gp = new GlobalConfiguration(root);
- gp.getVersion(); // initialize the configuration's version attribute
- return gp.isVersionCurrent();
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
- }
-
- return false;
- }
-
- /**
- * Return true if the given project has the current level of metadata, false otherwise.
- */
- public boolean isMigrated(IProject project) throws InvocationTargetException {
- if (project == null)return false;
-
- try {
- if (project.isAccessible()) {
- ProjectConfiguration prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
- if (prjp != null)return prjp.isVersionCurrent();
-
- String serializedPrjp = project.getPersistentProperty(USER_PREFERENCE);
- if (serializedPrjp != null) {
- prjp = new ProjectConfiguration(project);
- prjp.getVersion();
- return prjp.isVersionCurrent();
- }
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
- }
- return false;
- }
-
- /**
- * Answer the appropriate configuration based on whether the project has overridden the configuration
- * or not. If the project exists and is allowed to override the global configuration answer the
- * project configuration, otherwise answer the global configuration.
- * @param project it can be null
- */
- public ValidationConfiguration getConfiguration(IProject project) throws InvocationTargetException {
- if (project == null)return getGlobalConfiguration();
- ProjectConfiguration pc = getProjectConfiguration(project);
- if (pc != null && !pc.useGlobalPreference())return pc;
- return getGlobalConfiguration();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
deleted file mode 100644
index d603b8d..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
+++ /dev/null
@@ -1,358 +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;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class manages resource change events for the validation framework.
- */
-public class EventManager implements IResourceChangeListener {
- private static EventManager _inst;
-
- // false means that eclipse is not shutting down, and true means that it is shutting down.
- private boolean _shutdown;
-
- private IResourceDeltaVisitor _postAutoBuildVisitor;
- private boolean _isActive; // has the registry been read?
-
- private Set<IProjectChangeListener> _listeners = new CopyOnWriteArraySet<IProjectChangeListener>();
-
- private EventManager() {
- }
-
- public static EventManager getManager() {
- if (_inst == null)_inst = new EventManager();
- return _inst;
- }
-
- public void addProjectChangeListener(IProjectChangeListener listener){
- Tracing.log("EventManager-03: add listener: ", listener); //$NON-NLS-1$
- _listeners.add(listener);
- }
-
- public void removeProjectChangeListener(IProjectChangeListener listener){
- _listeners.remove(listener);
- }
-
- private void signal(IProject project, int type){
- if (Tracing.isLogging()){
- String name = "Null"; //$NON-NLS-1$
- if (project != null)name = project.getName();
- Tracing.log("EventManager-02: signal project: " + name + ", IProjectChangeListener type: " + type); //$NON-NLS-1$ //$NON-NLS-2$
- }
- for (IProjectChangeListener pcl : _listeners){
- try {
- pcl.projectChanged(project, type);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- public void opening(IProject project) {
- if (project == null || !ValidationPlugin.isActivated())return;
-
- signal(project, IProjectChangeListener.ProjectOpened);
-
- // When the project is opened, check for any orphaned tasks or tasks whose owners need to be updated.
-// ConfigurationManager.getManager().opening(project);
- }
-
- public void closing(IProject project) {
- if (project == null || !ValidationPlugin.isActivated())return;
-
- signal(project, IProjectChangeListener.ProjectClosed);
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load the
- // validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (ValidatorMetaData vmd : vmds) {
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been shut down,
- // don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = null;
- try {
- helper = vmd.getHelper(project);
- helper.closing();
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- ValidationPlugin.getPlugin().handleException(e);
- } catch (Exception e) {
- // If there is a problem with this particular helper, log the error and
- // continue with the next validator.
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- ConfigurationManager.getManager().closing(project);
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- public void deleting(IProject project) {
- if (project == null)return;
-
- signal(project, IProjectChangeListener.ProjectDeleted);
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load the
- // validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (ValidatorMetaData vmd : vmds) {
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been shut down,
- // don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = null;
- try {
- helper = vmd.getHelper(project);
- helper.deleting();
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- } catch (Exception e) {
- // If there is a problem with this particular helper, log the error and
- // continue with the next validator.
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- }
-
-// ConfigurationManager.getManager().deleting(project);
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- }
-
- /**
- * If a project's description changes, The project may have changed its nature. Update the cache
- * to reflect the new natures. The project could be opening. Migrate.
- */
- private void postAutoChange(IResourceDelta delta) {
- if (_postAutoBuildVisitor == null) {
- _postAutoBuildVisitor = new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta subdelta) throws CoreException {
- if (subdelta == null)return false;
-
- IResource resource = subdelta.getResource();
- if (resource instanceof IWorkspaceRoot)return true;
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if ((subdelta.getFlags() & IResourceDelta.DESCRIPTION) == IResourceDelta.DESCRIPTION) {
- signal(project, IProjectChangeListener.ProjectChanged);
- return false;
- }
-
- if ((subdelta.getFlags() & IResourceDelta.OPEN) == IResourceDelta.OPEN) {
- if (project.isOpen()) {
- // Project was just opened. If project.isOpen() had returned false,
- // project would just have been closed.
- opening(project);
- }
- return false;
- }
-
- if ((subdelta.getFlags() & IResourceDelta.ADDED) == IResourceDelta.ADDED) {
- signal(project, IProjectChangeListener.ProjectAdded);
- return false;
- }
- }
-
- return false;
- }
- };
- }
-
- try {
- delta.accept(_postAutoBuildVisitor, true);
- } catch (CoreException exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- }
- }
-
- /**
- * Notifies this manager that some resource changes have happened on the platform. If the change
- * is a project deletion, that project should be removed from the cache.
- *
- * @see IResourceDelta
- * @see IResource
- */
- public void resourceChanged(IResourceChangeEvent event) {
- if (_shutdown && !isActive()) {
- // If we're shutting down, and nothing has been activated, don't need to do anything.
- return;
- }
-
- if (Tracing.isLogging()){
- Tracing.log("Eventmanager-01: IResourceChangeEvent type=" + //$NON-NLS-1$
- Misc.resourceChangeEventType(event.getType()) +
- ", resource=" + //$NON-NLS-1$
- event.getResource() + ", source=" + event.getSource() + ", delta=" + //$NON-NLS-1$//$NON-NLS-2$
- event.getDelta());
- }
-
- if (event.getSource() instanceof IWorkspace) {
- boolean isProject = event.getResource() instanceof IProject;
- if ((event.getType() == IResourceChangeEvent.PRE_DELETE) && isProject) {
- deleting((IProject) event.getResource());
- } else if ((event.getType() == IResourceChangeEvent.PRE_CLOSE) && isProject) {
- closing((IProject) event.getResource());
- } else if (event.getType() == IResourceChangeEvent.POST_BUILD) {
- postAutoChange(event.getDelta());
- }
- }
- }
-
- /**
- * Notifies this manager that the ValidationPlugin is shutting down. (Usually implies that
- * either the plug-in could not load, or that the workbench is shutting down.)
- * <p>
- * The manager will then notify all active helpers of the shutdown, so that they may perform any
- * last-minute writes to disk, cleanup, etc.
- */
- public void shutdown() {
- try {
- // resourceChanged(IResourceChangeEvent) needs to know when a shutdown has started.
- _shutdown = true;
-
- // If the validators are loaded, then for every project in the workbench,
- // we must see if it has been loaded. If it has, every enabled IWorkbenchContext
- // must be called to clean up. If the project hasn't been loaded, then no
- // IWorkbenchContext built anything, and there's nothing to clean up.
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot workspaceRoot = workspace.getRoot();
- IProject[] projects = workspaceRoot.getProjects();
- ProjectConfiguration prjp = null;
- for (IProject project : projects) {
- if (!project.isOpen()) {
- // If the project isn't opened, there's nothing to clean up.
- // If the project was opened, it would have been migrated, and there's something
- // to clean up.
- continue;
- }
-
- try {
- boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
- // If it's not migrated, then it hasn't been loaded, and we don't want to load
- // the validator and its prerequisite plug-ins until they're needed.
- if (isMigrated) {
- prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- ValidatorMetaData[] vmdList = prjp.getEnabledValidators();
- // if vmdList is null, IProject has never been loaded, so nothing to clean up
- if (vmdList != null) {
- for (int j = 0; j < vmdList.length; j++) {
- ValidatorMetaData vmd = vmdList[j];
-
- if (!vmd.isActive()) {
- // If this validator has not been activated, or if it has been
- // shut down, don't activate it again.
- continue;
- }
-
- IWorkbenchContext helper = vmd.getHelper(project);
- if (helper != null) {
- try {
- helper.shutdown();
- } catch (Exception exc) {
- // Since we're shutting down, ignore the exception.
- }
- }
- }
- }
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- }
- } catch (Exception exc) {
- // Since we're shutting down, ignore the exception.
- }
- }
-
- public boolean isActive() {
- // Have to use this convoluted technique for the shutdown problem.
- // i.e., when eclipse is shut down, if validation plug-in hasn't been loaded,
- // the EventManager is activated for the first time, and it
- // sends many exceptions to the .log. At first, I wrote a
- // static method on ValidationRegistryReader, which returned true
- // if the registry had been read, and false otherwise. However,
- // that didn't solve the exception problem, because eclipse's
- // class loader failed to load the ValidationRegistryReader class.
- //
- // The fix is to keep all shutdown mechanisms in this class.
- // Track everything in here.
- return _isActive;
- }
-
- /**
- * This method should only be called by the ValidationRegistryReader once the registry has been
- * read.
- */
- public void setActive(boolean b) {
- _isActive = b;
- }
-
- /**
- * This method should be used to determine if the workbench is running in UI or Headless.
- *
- * @deprecated This plug-in no longer depends on jem. If you need this function use the jem
- * code directly.
- */
- public static boolean isHeadless() {
- //return UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
deleted file mode 100644
index 39a36bc..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
+++ /dev/null
@@ -1,658 +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;
-
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchFileDelta;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Utility class for the ValidationOperation hierarchy.
- */
-public final class FilterUtil {
- private static VMDDeltaVisitor _deltaVisitor = null;
- private static VMDResourceVisitor _resourceVisitor = null;
-
- private interface VMDRecorder {
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult();
-
- public void setEnabledValidators(Set<ValidatorMetaData> enabledValidators);
-
- public void setProgressMonitor(IProgressMonitor monitor);
-
- public IProgressMonitor getProgressMonitor();
- }
-
- private interface VMDDeltaVisitor extends VMDRecorder, IResourceDeltaVisitor {
- }
-
- private interface VMDResourceVisitor extends VMDRecorder, IResourceVisitor {
- }
-
- private FilterUtil() {
- }
-
- /**
- * Given a Set of enabled ValidatorMetaData, create a Map with each ValidatorMetaData as a key
- * with an associated null value.
- */
- static Map<ValidatorMetaData, Set<IFileDelta>> wrapInMap(Set<ValidatorMetaData> enabledValidators) {
- Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
- if ((enabledValidators == null) || (enabledValidators.size() == 0))return result;
-
- for (ValidatorMetaData vmd : enabledValidators)result.put(vmd, null);
- return result;
- }
-
- static void checkCanceled(IProgressMonitor monitor) throws OperationCanceledException {
- if (monitor == null)return;
- else if (monitor.isCanceled())throw new OperationCanceledException(""); //$NON-NLS-1$
- }
-
- /**
- * Given a Map of VMD <=>Set(IFileDelta), either return the existing Set or create a Set and
- * return it.
- */
- private static Set<IFileDelta> getResourceDeltas(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- ValidatorMetaData vmd) {
- Set<IFileDelta> fileDeltas = enabledValidators.get(vmd);
- if (fileDeltas == null) {
- fileDeltas = new HashSet<IFileDelta>();
- enabledValidators.put(vmd, fileDeltas);
- }
- return fileDeltas;
- }
-
- /**
- * Given the IFileDelta type, return the corresponding IResourceDelta type.
- */
- private static int getResourceDeltaType(int ifileDeltaType) {
- switch (ifileDeltaType) {
- case (IFileDelta.ADDED) : {
- return IResourceDelta.ADDED;
- }
-
- case (IFileDelta.DELETED) : {
- return IResourceDelta.REMOVED;
- }
-
- case (IFileDelta.CHANGED) :
- default : {
- return IResourceDelta.CHANGED;
- }
- }
- }
-
- /**
- * Given the IResourceDelta type, return the corresponding IFileDelta type.
- */
- static int getFileDeltaType(int iresourceDeltaType) {
- switch (iresourceDeltaType) {
- case IResourceDelta.ADDED : // resource has been added to the workbench
- {
- return IFileDelta.ADDED;
- }
-
- case IResourceDelta.CHANGED : // resources has been changed in the workbench
- {
- return IFileDelta.CHANGED;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench
- {
- return IFileDelta.DELETED;
- }
-
- case IResourceDelta.ADDED_PHANTOM : // incoming workbench resource
- {
- return IFileDelta.ADDED;
- }
-
- case IResourceDelta.REMOVED_PHANTOM : // outgoing workbench resource
- {
- return IFileDelta.DELETED;
- }
-
- default : {
- return IFileDelta.CHANGED;
- }
- }
- }
-
-
- /**
- * Return the validators which are both configured on this type of project, (as stored in
- * getProject()), and enabled by the user on this project.
- */
- static void addFileDelta(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- ValidatorMetaData vmd, WorkbenchFileDelta fileDelta) {
- Set<IFileDelta> fileDeltas = getResourceDeltas(enabledValidators, vmd);
- fileDeltas.add(fileDelta);
- enabledValidators.put(vmd, fileDeltas);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[].
- *
- * If filterIn is true, do not check if the resources are filtered in by the validator. If
- * filterIn is false, check if the resources are filtered in by the validator (recommended).
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>>
- getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, boolean filterIn) {
- // by default assume that the resources have changed, i.e. not added or deleted
- return getFileDeltas(enabledValidators, changedResources, IFileDelta.CHANGED, filterIn);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[], with each delta of type deltaType.
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>>
- getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, int ifileDeltaType) {
- // by default check if the Objects are filtered in by the validator
- return getFileDeltas(enabledValidators, changedResources, ifileDeltaType, false);
- }
-
- /**
- * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
- * IFileDelta wrapper around the changed Object[].
- * <p>
- * If "force" is true, then don't check if the object is filtered in by the validator or not.
- * ValidatorSubsetOperation can use validators that don't filter in these particular resources,
- * but can use a defaultExtension's validators instead.
- */
- public static Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(Set<ValidatorMetaData> enabledValidators,
- Object[] changedResources, int ifileDeltaType, boolean force) {
-
- Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return result;
- }
-
- boolean cannotLoad = false;
- IWorkbenchContext helper = null;
- for (ValidatorMetaData vmd : enabledValidators) {
- try {
- Set<IFileDelta> deltas = new HashSet<IFileDelta>();
- IProgressMonitor monitor = new NullProgressMonitor();
- for (int i = 0; i < changedResources.length; i++) {
- Object obj = changedResources[i];
- WorkbenchFileDelta wfd = null;
- if (obj instanceof IResource) {
- IResource res = (IResource) obj;
- if (force || !filterOut(monitor, vmd, res, getResourceDeltaType(ifileDeltaType))) {
- helper = vmd.getHelper(res.getProject());
-
- wfd = getFileDelta(helper, vmd, res, getResourceDeltaType(ifileDeltaType));
- }
- } else {
- wfd = new WorkbenchFileDelta(obj);
- }
-
- if (wfd != null) {
- deltas.add(wfd);
- }
- }
- result.put(vmd, deltas);
- } catch (InstantiationException e) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
- }
-
- if (cannotLoad) {
- // Some of the validators should not be in the result set because either their
- // validator class or helper class could not be instantiated.
- Object[] vmds = enabledValidators.toArray();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
- if (vmd.cannotLoad()) {
- result.remove(vmd);
- }
- }
- }
-
- return result;
- }
-
- public static WorkbenchFileDelta getFileDelta(IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int iresourceDeltaType) {
- // strip off the eclipse-specific information
- String fileName = helper.getPortableName(resource);
- if (fileName == null) {
- // The resource is not contained in the current project.
- // Can't see how this would happen, but check for it anyway.
-
- // [122960] null should be allowed
-// String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NULL_NAME),
-// new Object[]{resource.getName(), vmd.getValidatorDisplayName()});
-// ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
-
- IPath resourcePath = resource.getFullPath();
- if (resourcePath != null) {
- // Since null file names are not allowed, default to the fully-qualified name of the
- // resource.
- fileName = resourcePath.toString();
- } else {
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR,
- "portableName is null and path is null for resource " + resource); //$NON-NLS-1$
- return null;
- }
- }
-
- int ifileDeltaType = getFileDeltaType(iresourceDeltaType);
- return new WorkbenchFileDelta(fileName, ifileDeltaType, resource);
- }
-
-
- /**
- * Add the IResource to the vmd's list of resources to validate. Return true if the add was
- * successful or false if the add was not successful.
- */
- static boolean addToFileList(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int resourceDelta, boolean isFullBuild) {
- if ((vmd == null) || (resource == null)) {
- return false;
- }
-
- try {
- helper.registerResource(resource);
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- InternalValidatorManager.getManager().addInternalErrorTask(resource.getProject(), vmd, exc);
-
- // Don't return ... even though the register threw an exception, that's not to say
- // that the validator can't validate.
- }
-
- if (isFullBuild) {
- // To indicate a full build to the validator, don't build up a list of files;
- // pass in null instead. Given that the list of files should not be used,
- // don't calculate it.
- return true;
- }
-
-
- WorkbenchFileDelta newFileDelta = getFileDelta(helper, vmd, resource, resourceDelta);
- if (newFileDelta != null) {
- // if delta is null, getFileDelta will have logged the problem already
- addFileDelta(enabledValidators, vmd, newFileDelta);
- }
-
- return true;
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * To process a resource, there are several steps: 1. check if the resource is registered for
- * this validator (i.e., the validator has either specified it in a filter, or has not filtered
- * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the Validator itself, in
- * addition to the static filtering done by the framework, based on the information in
- * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
- * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
- * (i.e., one resource has been processed.)
- */
- static boolean filterOut(IProgressMonitor monitor, ValidatorMetaData vmd, IResource resource, int resourceDelta) {
- if (monitor == null) {
- return false;
- }
-
- checkCanceled(monitor);
- return !(vmd.isApplicableTo(resource, resourceDelta));
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both
- * will call this method to process the resource. This method calls the
- * current Validator to filter the resource (i.e., this method returns if
- * the resource fails the filter test). It also sends output to the
- * <code>IProgressMonitor</code>, and calls the current Validator to
- * validate the resource.
- * <p>
- * To process a resource, there are several steps:
- * <ol>
- * <li>Check if the resource is registered for this validator (i.e., the
- * validator has either specified it in a filter, or has not filtered it out
- * explicitly)
- * <li>Call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the
- * Validator itself, in addition to the static filtering done by the
- * framework, based on the information in the extension point.
- * <li>If the resource passes both filters, call <code>validate</code> on
- * the validator, with the resource.
- * <li>When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the
- * IProgressMonitor's status by one (i.e., one resource has been processed.)
- * </ol>
- */
- static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- IResource resource, int resourceDelta, boolean isFullBuild) {
- if (monitor == null)return;
-
- checkCanceled(monitor);
-
- boolean cannotLoad = false;
- for (ValidatorMetaData vmd : enabledValidators.keySet()) {
- checkCanceled(monitor);
-
- if (!filterOut(monitor, vmd, resource, resourceDelta)) {
- try {
- // Notify the helper that a resource is about to be filtered in
- IWorkbenchContext helper = vmd.getHelper(resource.getProject());
- addToFileList(enabledValidators, helper, vmd, resource, resourceDelta, isFullBuild);
- } catch (InstantiationException e) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- if (cannotLoad) {
- // Some of the validators need to be removed from the set because the validator
- // or helper cannot be instantiated.
- Object[] vmds = enabledValidators.keySet().toArray();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
- if (vmd.cannotLoad()) {
- enabledValidators.remove(vmd);
- }
- }
- }
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * This method is called during an incremental, not a full, validation. The full validation
- * fakes an IResourceDelta, and the incremental needs to check that the delta is one of the
- * deltas which is filtered in by the validation framework.
- *
- * @see filterOut(IResourceDelta)
- *
- * To process a resource, there are several steps: 1. check if the resource is registered for
- * this validator (i.e., the validator has either specified it in a filter, or has not filtered
- * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the Validator itself, in
- * addition to the static filtering done by the framework, based on the information in
- * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
- * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
- * (i.e., one resource has been processed.)
- */
- static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators,
- IResource resource, IResourceDelta delta) {
- // filter in only resources which have been added, deleted, or its content changed.
- // moves will be registered as an add & delete combination
- if (filterOut(delta))return;
-
- filterOut(monitor, enabledValidators, resource, delta.getKind(), false); // false =
- // incremental
- // build
- }
-
- /**
- * Filter out resource deltas which don't correspond to changes that validators can validate.
- *
- * This method will filter in deltas only if the delta is an add, a delete, or if the content of
- * the file has changed.
- *
- * Return true if the delta should be filtered out, and false if we should validate it.
- *
- * @see IResourceDelta
- */
- static boolean filterOut(IResourceDelta delta) {
- if (delta == null) {
- return true;
- }
-
- switch (delta.getKind()) {
- case IResourceDelta.ADDED : // resource has been added to the workbench
- {
- return false;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench
- {
- // If the delta is an IProject, and the IProject is getting deleted or closed, don't
- // validate it or its children.
- if (delta.getResource() instanceof IProject) {
- return true;
- }
- return false;
- }
-
- case IResourceDelta.CHANGED : // resources has been changed in the workbench
- {
- // We want to add the enterprise bean only if its source file's
- // contents have changed. (for example, if a folder has been
- // added to the project, the IFile will be changed because
- // its position has been changed, but the enterprise bean
- // doesn't need to be redeployed. See IResourceDelta.getFlags()
- // for more information.)
- //
- // Or, if ejb-jar.xml has changed, the EJBJar is destroyed & created
- // from scratch, so the list of EnterpriseBean is new. Purge the old
- // EJBJar from the EJBCache (since it will never be referenced again),
- // and load the new EJBJar into the cache.
- if ((delta.getResource() instanceof IFile) && ((delta.getFlags() & IResourceDelta.CONTENT) != 0)) {
- return false;
- }
- }
- }
- return true;
- }
-
- /**
- * This method returns true if the given resource and its children should be processed by the
- * validators. That is, there are several types of changes which can occur to an IProject which
- * should not trigger a revalidation of the project or its children. (e.g. project is deleted or
- * closed.) For those cases, or if the IResourceDelta is invalid, this method will return false
- * (do not validate the IProject or its children). Otherwise, return true (validate the resource &
- * its children). If an IProject itself has not changed, but one of its children has
- * (delta.getKind() of NO_CHANGE), then return true so that the children are validated.
- */
- static boolean shouldProcess(IResource resource, IResourceDelta delta) {
- if ((resource != null) && !(resource instanceof IProject)) {
- return true;
- }
-
- if (delta == null) {
- return false;
- }
-
- switch (delta.getKind()) {
- case IResourceDelta.ADDED : // resource has been deleted from the workbench; may be part
- // of a move
- {
- if (0 != (delta.getFlags() & IResourceDelta.MOVED_FROM)) {
- // If it's being moved, don't revalidate its children. If it's being added, fall
- // through to the "return true;" at the end of this method.
- return false;
- }
- break;
- }
-
- case IResourceDelta.REMOVED : // resource has been deleted from the workbench; may be
- // part of a move
- {
- // Whether it's being deleted or moved, don't revalidate its children.
- return false;
- }
-
- case IResourceDelta.CHANGED : // resource has been changed in the workbench; may be part
- // of a move
- {
- if ((delta.getFlags() & IResourceDelta.OPEN) != 0) {
- // Change is related to the OPEN bit. Whether the project was closed and is now
- // open,
- // or the project was open and is now closed, don't need to revalidate the
- // children.
- return false;
- } else if ((delta.getFlags() & IResourceDelta.REPLACED) != 0) {
- // project was moved
- return false;
- }
-
- break;
- }
- }
-
- return true;
- }
-
- private static VMDResourceVisitor getResourceVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
- if (_resourceVisitor == null) {
- _resourceVisitor = new VMDResourceVisitor() {
- private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set<ValidatorMetaData> validators) {
- _vmdDeltas = wrapInMap(validators);
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _progressMonitor;
- }
-
- public void setProgressMonitor(IProgressMonitor m) {
- _progressMonitor = m;
- }
-
- public boolean visit(IResource res) throws CoreException {
- FilterUtil.checkCanceled(getProgressMonitor());
-
- // We don't need to filter out anything, because a full validation
- // is about to be performed.
- filterOut(getProgressMonitor(), _vmdDeltas, res, IResourceDelta.CHANGED, true);
-
- return true; // visit the resource's children as well
- }
- };
- }
- _resourceVisitor.setProgressMonitor(monitor);
- _resourceVisitor.setEnabledValidators(enabledValidators);
-
- return _resourceVisitor;
- }
-
- private static VMDDeltaVisitor getDeltaVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
- if (_deltaVisitor == null) {
- _deltaVisitor = new VMDDeltaVisitor() {
- private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set<ValidatorMetaData> validators) {
- _vmdDeltas = wrapInMap(validators);
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _progressMonitor;
- }
-
- public void setProgressMonitor(IProgressMonitor m) {
- _progressMonitor = m;
- }
-
- public boolean visit(IResourceDelta subdelta) throws CoreException {
- checkCanceled(getProgressMonitor());
- if (subdelta == null)
- return true;
-
- IResource resource = subdelta.getResource();
-
- if (Tracing.isLogging(2)) {
- StringBuffer buffer = new StringBuffer("FilterUtil-01: subdelta of "); //$NON-NLS-1$
- buffer.append(resource.getName());
- buffer.append(" has resource delta kind: "); //$NON-NLS-1$
- buffer.append(subdelta.getKind());
- buffer.append(" Does the resource exist? "); //$NON-NLS-1$
- buffer.append(resource.exists());
- buffer.append(" Is it a phantom? "); //$NON-NLS-1$
- buffer.append(resource.isPhantom());
- Tracing.log(buffer);
- }
-
- // If the delta is an IProject, and the IProject is getting deleted or closed,
- // don't validate it or its children.
- if (shouldProcess(resource, subdelta)) {
- filterOut(getProgressMonitor(), _vmdDeltas, resource, subdelta);
- return true; // visit the delta's children as well
- }
- return false; // do not visit the delta's children
- }
- };
- }
- _deltaVisitor.setProgressMonitor(monitor);
- _deltaVisitor.setEnabledValidators(enabledValidators);
-
- return _deltaVisitor;
- }
-
- public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor,
- final Set<ValidatorMetaData> enabledValidators, IResourceDelta delta) throws CoreException {
- VMDDeltaVisitor visitor = getDeltaVisitor(monitor, enabledValidators);
- delta.accept(visitor, true); // true means include phantom resources
- return visitor.getResult();
- }
-
- public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor,
- final Set<ValidatorMetaData> enabledValidators, IProject project) throws CoreException {
- VMDResourceVisitor visitor = getResourceVisitor(monitor, enabledValidators);
- project.accept(visitor, IResource.DEPTH_INFINITE, true); // true means include phantom
- // resources
- return visitor.getResult();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
deleted file mode 100644
index 20c044f..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
+++ /dev/null
@@ -1,197 +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;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class represents the global Preferences as set on the Validation Preferences page.
- */
-public class GlobalConfiguration extends ValidationConfiguration {
- static final boolean PREF_PROJECTS_CAN_OVERRIDE_DEFAULT = true;
- static final boolean PREF_SAVE_AUTOMATICALLY_DEFAULT = false;
-
- private boolean _canProjectsOverride = getCanProjectsOverrideDefault();
- private boolean _saveAutomatically = getSaveAutomaticallyDefault();
-
- /**
- * This constructor should be used in all cases except for the Preference page's values.
- */
- public GlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
- super(root, convertToArray(ValidationRegistryReader.getReader().getAllValidators()));
-
- // Can't put the call to load() and passivate() in the ValidationConfiguration constructor due
- // to the order of initialization.
- // 1. First the ValidationConfiguration constructor is called, and that loads the stored values.
- // 2. Then this class's <init> method is called, and that initializes the "override" field
- // to the default, which may be different than the stored value.
- }
-
- /**
- * This constructor is provided only for the Preference page, so that the page can store values
- * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
- */
- public GlobalConfiguration(GlobalConfiguration original) throws InvocationTargetException {
- super(original.getResource());
- original.copyTo(this);
- }
-
- public boolean canProjectsOverride() {
- return _canProjectsOverride;
- }
-
- public void setCanProjectsOverride(boolean can) {
- _canProjectsOverride = can;
- }
-
- public boolean getSaveAutomatically() {
- return _saveAutomatically;
- }
-
- public void setSaveAutomatically(boolean save) {
- _saveAutomatically = save;
- }
-
- public void resetToDefault() throws InvocationTargetException {
- setDisableAllValidation(getDisableValidationDefault());
- setEnabledValidators(getEnabledValidatorsDefault());
- setEnabledManualValidators(getManualEnabledValidators());
- setEnabledBuildValidators(getBuildEnabledValidators());
- setCanProjectsOverride(getCanProjectsOverrideDefault());
- setSaveAutomatically(getSaveAutomaticallyDefault());
- setDefaultDelegates(getValidators());
- }
-
- /**
- * This method exists only for migration purposes. The root marker must be deleted after
- * migration is complete.
- */
- protected IMarker[] getMarker() {
- try {
- IWorkspaceRoot root = getRoot();
- IMarker[] markers = root.findMarkers(ConfigurationConstants.PREFERENCE_MARKER, false, IResource.DEPTH_ONE);
-
- if (markers.length == 1) {
- return markers;
- }
- // job is done. Nothing to migrate.
- return null;
-
- } catch (CoreException e) {
- // Can't find the IMarker? Assume it's deleted.
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected void load(IMarker[] marker) throws InvocationTargetException {
- // The 5.0 preferences were stored in an IMarker, and the current.preferences are stored in
- // PersistentProperties on the IResource.
- // A 5.0 root can have no marker values if the preference page, properties page, and
- // validation were never viewed or run.
- try {
- IWorkspaceRoot root = getRoot();
- if (marker == null) {
- // There were no global preferences in 4.03, so the migration is to create some.
- resetToDefault(); // assign the default values to the new Global Preference
- return;
- }
-
- IMarker rootMarker = marker[0]; // getMarker() has already checked that there's a marker
- // in the array
-// ValidatorMetaData[] enabledValidators = null;
-// String enabledValidatorsString = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_VALIDATORS);
-// if (enabledValidatorsString == null) {
-// enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
-// } else {
-// enabledValidators = getStringAsEnabledElementsArray(enabledValidatorsString);
-// }
-//
-// setEnabledValidators(enabledValidators);
- String enabledManualValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- setEnabledManualValidators(getStringAsEnabledElementsArray(enabledManualValidators));
- String enabledBuildValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
- setEnabledManualValidators(getStringAsEnabledElementsArray(enabledBuildValidators));
-// if (enabledManualValidators.equals(null) || enabledBuildValidators.equals(null))
-// enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
- setCanProjectsOverride(getValue(rootMarker, ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE, PREF_PROJECTS_CAN_OVERRIDE_DEFAULT));
- root.getWorkspace().deleteMarkers(marker);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- protected void copyTo(GlobalConfiguration gp) throws InvocationTargetException {
- super.copyTo(gp);
-
- // Need to have a distinct method for this child class (i.e., the parameter
- // is not a ValidationConfiguration) because if this initialization is
- // called as part of ValidationConfiguration's constructor, then the value of
- // this field is overwritten. Fields of this class are initialized to the
- // default after the ValidationConfiguration parent is created.
- gp.setCanProjectsOverride(canProjectsOverride());
- gp.setSaveAutomatically(getSaveAutomatically());
- }
-
- public static boolean getCanProjectsOverrideDefault() {
- return PREF_PROJECTS_CAN_OVERRIDE_DEFAULT;
- }
-
- public static boolean getSaveAutomaticallyDefault() {
- return PREF_SAVE_AUTOMATICALLY_DEFAULT;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#deserialize(String)
- */
- public void deserialize(String storedConfiguration) throws InvocationTargetException {
- super.deserialize(storedConfiguration);
-
- if (storedConfiguration != null && storedConfiguration.length() > 0) {
- // If it's null, then super.deserialize has already called resetToDefault to initialize
- // this instance.
- int canOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int saveAutomaticallyIndex = storedConfiguration.indexOf(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
- if (disableAllValidationIndex != -1) {
- String canOverride = storedConfiguration.substring(canOverrideIndex + ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE.length(), disableAllValidationIndex);
- setCanProjectsOverride(Boolean.valueOf(canOverride).booleanValue());
- }
- if(saveAutomaticallyIndex != -1)
- {
- String saveAutomatically = storedConfiguration.substring(saveAutomaticallyIndex + ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING.length(), canOverrideIndex);
- setSaveAutomatically(Boolean.valueOf(saveAutomatically).booleanValue());
- }
- }
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#serialize()
- */
- public String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
- buffer.append(String.valueOf(getSaveAutomatically()));
- buffer.append(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
- buffer.append(String.valueOf(canProjectsOverride()));
- buffer.append(super.serialize());
- return buffer.toString();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
deleted file mode 100644
index 959988e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
+++ /dev/null
@@ -1,27 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-
-/**
- * ValidatorHelper extensions must implement this interface.
- */
-public interface IProjectValidationHelper {
-
- public IContainer[] getOutputContainers(IProject project);
-
- public IContainer[] getSourceContainers(IProject project);
-
- public void disposeInstance();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
deleted file mode 100644
index 38292b6..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This is used by extensions to add valid validation types to the validate
- * menu action.
- */
-public interface IValidationSelectionHandler {
-
- /**
- * Return a valid IResource type for the extensible object selection,
- * should be instance of IFolder, IFile, or IProject if this extension knows
- * how to handle the selection, otherwise it should return null
- */
- public IResource getBaseValidationType(Object selection);
-
- /**
- * @return the classname of the validation type to register for validation
- */
- public String getValidationTypeString();
-
- public void setValidationTypeString(String validationType);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
deleted file mode 100644
index 5f9dba8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
+++ /dev/null
@@ -1,183 +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;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public final class InternalValidatorManager {
- private static InternalValidatorManager _inst = null;
- private static final String OP_GROUP = "ValidationOperation"; //$NON-NLS-1$ // when the ValidationOperation
-
- // adds a message to the task
- // list; e.g. cancel, or internal
- // error, this group name is used
- // to distinguish between the
- // messages that the validator
- // itself put, and the ones which
- // the validator owns, but the
- // operation put. //$NON-NLS-1$
-
- private InternalValidatorManager() {
- //default
- }
-
- public static InternalValidatorManager getManager() {
- if (_inst == null) {
- _inst = new InternalValidatorManager();
- }
- return _inst;
- }
-
- /**
- * Return a new Set that contains all of the elements from the array.
- */
- public static Set<ValidatorMetaData> wrapInSet(ValidatorMetaData[] vmds) {
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- if ((vmds == null) || (vmds.length == 0))return result;
-
- for (ValidatorMetaData vmd : vmds)result.add(vmd);
-
- return result;
- }
-
- /**
- * If the current validator throws a Throwable, log the internal error to the task list.
- *
- * This method is for use by the validation framework only.
- */
- public void addInternalErrorTask(IProject project, ValidatorMetaData vmd, Throwable exc) {
- addOperationTask(project, vmd, ResourceConstants.VBF_EXC_INTERNAL, new String[]{project.getName(), vmd.getValidatorDisplayName(), ((exc.getMessage() == null) ? "" : exc.getMessage())}); //$NON-NLS-1$
- }
-
- /**
- * If the user is cancelling validation on the current project/resource, Add an information task
- * to the task list informing the user that validation has not been run on the current project.
- *
- * If the current validator throws a Throwable, log the internal error to the task list.
- */
- public void addOperationTask(IProject project, ValidatorMetaData vmd, String messageId, String[] parms) {
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.LOW_SEVERITY);
- message.setId(messageId);
- message.setParams(parms);
- message.setGroupName(OP_GROUP);
-
- // Although the message is owned by the validator, the string of the message has to be
- // loaded by this class' ClassLoader
- WorkbenchReporter.addMessage(project, vmd.getValidatorUniqueName(), getClass().getClassLoader(), message);
- }
-
-
- /**
- * If the user cancelled the previous validation with this validator, or if there was a
- * Throwable caught during the last execution of this validator, and the validator is in the
- * process of validating now, remove the former information task messages.
- */
- public void removeOperationTasks(IProject project, ValidatorMetaData vmd) {
- WorkbenchReporter.removeMessageSubset(project, vmd.getValidatorUniqueName(), OP_GROUP);
- }
-
- /**
- * Return an array of the fully-qualified names of the validator classes.
- */
- public String[] getValidatorNames(ValidatorMetaData[] vmds) {
- Set<String> temp = new HashSet<String>();
- for (ValidatorMetaData vmd : vmds) {
- for (String name : vmd.getValidatorNames()) {
- temp.add(name);
- }
- }
-
- String[] vmdNames = new String[temp.size()];
- temp.toArray(vmdNames);
- return vmdNames;
- }
-
- /**
- * Return an array of the fully-qualified names of the validator classes.
- */
- public String[] getValidatorNames(Collection<ValidatorMetaData> vmds) {
- Set<String> temp = new HashSet<String>();
- for (ValidatorMetaData vmd : vmds) {
- for (String name : vmd.getValidatorNames()) {
- temp.add(name);
- }
- }
-
- String[] vmdNames = new String[temp.size()];
- temp.toArray(vmdNames);
- return vmdNames;
- }
-
- /**
- * Return a list of validators that validate files with the given extension.
- */
- public ValidatorMetaData[] getValidatorsForExtension(IProject project, String fileExtension) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- // Get all of the validators configured on the project for the given file extension
- ValidatorMetaData[] vmds = prjp.getValidators();
-
- // Construct a fake IFile type to represent a file with this extension.
- StringBuffer buffer = new StringBuffer(project.getName());
- buffer.append(IPath.SEPARATOR);
- buffer.append(fileExtension);
- IPath path = new Path(buffer.toString());
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
- ValidatorMetaData[] temp = new ValidatorMetaData[vmds.length];
- int count = 0;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (vmd.isApplicableTo(file)) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return new ValidatorMetaData[0];
- }
- }
-
- /**
- * Return a list of validator names that validate files with the given extension.
- */
- public String[] getValidatorNamesForExtension(IProject project, String fileExtension) {
- ValidatorMetaData[] vmds = getValidatorsForExtension(project, fileExtension);
-
- String[] names = new String[vmds.length];
- for (int i = 0; i < names.length; i++) {
- names[i] = vmds[i].getValidatorUniqueName();
- }
- return names;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
deleted file mode 100644
index 5f39ecf..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
+++ /dev/null
@@ -1,659 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * This class represents the Project Preferences as set on the Project's Validation Properties page.
- */
-public class ProjectConfiguration extends ValidationConfiguration {
-
- /** false - If the user has never set a preference before, this is the override default */
- static final boolean PRJ_OVERRIDEGLOBAL_DEFAULT = false;
-
- /** default_value - the configuration is using the defaults. */
- private static final String DefaultValue = "default_value"; //$NON-NLS-1$
-
- private boolean _doesProjectOverride = getDoesProjectOverrideDefault();
-
- /**
- * This constructor should be used in all cases except for the Properties page's values.
- */
- protected ProjectConfiguration(IProject project) throws InvocationTargetException {
- // The extractProjectValidators method extracts just this project's validators from the
- // global list.
- super(project, extractProjectValidators(convertToArray(ValidationRegistryReader.getReader().getAllValidators()), project));
-
- // Can't put the call to load() and passivate() in the ValidationConfiguration constructor due
- // to the order of initialization.
- // 1. First the ValidationConfiguration constructor is called, and that loads the stored values.
- // 2. Then this class's <init> method is called, and that initializes the "override" field
- // to the default, which may be different than the stored value.
- }
-
- /**
- * This constructor is provided only for the Properties page, so that the page can store values
- * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
- *
- * @deprecated
- */
- public ProjectConfiguration(ProjectConfiguration original) throws InvocationTargetException {
- super(original.getResource());
- original.copyTo(this);
- }
-
- /**
- * Return the ValidationConfiguration to use, whether global or project.
- */
- public boolean useGlobalPreference() {
- try {
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- if (gp == null) {
- return false;
- }
-
- if (!gp.canProjectsOverride()) {
- // If project's can't override the global, use the global
- return true;
- }
-
- // If the project overrides, then don't use the global.
- // If the project does not override, use the global.
- return !_doesProjectOverride;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return false;
- }
- }
-
- public boolean getDoesProjectOverride(){
- return _doesProjectOverride;
- }
-
- public boolean doesProjectOverride() {
- // If the global preference doesn't allow projects to override, it doesn't matter what the
- // value of _doesProjectOverride is.
- return !useGlobalPreference();
- }
-
- public void setDoesProjectOverride(boolean does) {
- _doesProjectOverride = does;
- }
-
- /**
- * If the preferences should be used then the preference settings are returned; otherwise return
- * the project settings.
- */
- public ValidatorMetaData[] getEnabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledValidators(), getResource());
- }
- return super.getEnabledValidators();
- }
-
- public ValidatorMetaData[] getManualEnabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getManualEnabledValidators(), getResource());
- }
- return super.getManualEnabledValidators();
- }
-
- public ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getBuildEnabledValidators(), getResource());
- }
- return super.getBuildEnabledValidators();
- }
-
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#getDisabledValidators()
- */
- public ValidatorMetaData[] getDisabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getDisabledValidators(), getResource());
- }
- return super.getDisabledValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#getValidators()
- */
- public ValidatorMetaData[] getValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getValidators(), getResource());
- }
- return super.getValidators();
- }
-
- public Map<String,String> getDelegatingValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().getDelegatingValidators();
- }
- return super.getDelegatingValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledIncrementalValidators(boolean)
- */
- public ValidatorMetaData[] getEnabledIncrementalValidators(boolean incremental) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledIncrementalValidators(incremental), getResource());
- }
- return super.getEnabledIncrementalValidators(incremental);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#isEnabled(ValidatorMetaData)
- */
- public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().isEnabled(vmd);
- }
- return super.isEnabled(vmd);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfDisabledValidators()
- */
- public int numberOfDisabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfDisabledValidators();
- }
- return super.numberOfDisabledValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledIncrementalValidators()
- */
- public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledIncrementalValidators();
- }
- return super.numberOfEnabledIncrementalValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledValidators()
- */
- public int numberOfEnabledValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledValidators();
- }
- return super.numberOfEnabledValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfIncrementalValidators()
- */
- public int numberOfIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfIncrementalValidators();
- }
- return super.numberOfIncrementalValidators();
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfValidators()
- */
- public int numberOfValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfValidators();
- }
- return super.numberOfValidators();
- }
-
- /**
- * This method could be called with the project's values, or with the global preference values.
- * Validators that are not configured on this project will be ignored.
- */
- public void setEnabledValidators(ValidatorMetaData[] vmds) {
- super.setEnabledValidators(extractProjectValidators(vmds, getResource()));
- }
-
- /**
- * This method could be called with the project's values, or with the global preference values.
- * Validators that are not configured on this project will be ignored.
- */
- public void setValidators(ValidatorMetaData[] vmds) {
- super.setValidators(extractProjectValidators(vmds, getResource()));
- }
-
- /**
- * Given a set of validators, usually the global preference set, change the set so that it
- * contains only the validators configured on this project.
- */
- private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource) {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- int length = (vmds == null) ? 0 : vmds.length;
- ValidatorMetaData[] temp = new ValidatorMetaData[length];
- if (length == 0) {
- return temp;
- }
-
- int count = 0;
- IProject project = (IProject) resource;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (reader.isConfiguredOnProject(vmd, project)) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- temp = null;
-
- return result;
- }
-
- public void resetToDefault() throws InvocationTargetException {
- // The default values of the project is whatever the preference values are
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
-
- setEnabledManualValidators(gp.getManualEnabledValidators());
- setEnabledBuildValidators(gp.getBuildEnabledValidators());
- setDelegatingValidators(gp.getDelegatingValidators());
-
- // except for this field, which is unique to the project preferences
- setDoesProjectOverride(getDoesProjectOverrideDefault());
- }
-
- public void resetToDefaultForProjectDescriptionChange() throws InvocationTargetException {
- // The default values of the project is whatever the preference values are
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- setEnabledManualValidators(gp.getManualEnabledValidators());
- setEnabledBuildValidators(gp.getBuildEnabledValidators());
- setDelegatingValidators(gp.getDelegatingValidators());
- }
-
- /**
- * The project's nature has changed, so recalculate the validators that are configured on the
- * project, and reset the values of the project to the default.
- *
- * @deprecated this method doesn't do anything
- */
- public void resetProjectNature() {
- /*
- * We do not want to perform the resetting the of the validators as the nature never gets
- * reset due to change in the project references - VKB GlobalConfiguration gp =
- * ConfigurationManager.getManager().getGlobalConfiguration();
- * setValidators(gp.getValidators()); // Reset the validators that are configured on the
- * project (the ProjectConfiguration automatically saves only the validators that are
- * configured on the project). resetToDefault(); // Given that the project is "new", reset
- * its values to the Preferences.
- */
- }
-
- /**
- * This method exists only for migration purposes. The project marker must be deleted after
- * migration is complete.
- */
- protected IMarker[] getMarker() {
- try {
- // First try to find the 4.03 project marker.
- IMarker[] allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER_403, false, IResource.DEPTH_ZERO);
-
- // If it doesn't exist, then this might be a 5.0 project marker.
- if ((allMarkers == null) || (allMarkers.length == 0)) {
- allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER, false, IResource.DEPTH_ZERO);
- }
-
- // There should be only one projectmarker.
- if (allMarkers.length == 1) {
- return allMarkers;
- }
- // Job is done. Nothing to migrate.
- return null;
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected void load(IMarker[] marker) {
- // 4.03 project preferences are different from the current in the following ways:
- // 1. Only preferences that could be set were the enabled validators and the auto-validate
- // option.
- // 2. The preferences were stored in an IMarker instead of a PersistentProperty.
- // The 5.0 project settings were stored in an IMarker, and the current settings are stored
- // in a PersistentProperty.
- // A 5.0 project could have a null validation marker if the validation page was never
- // opened on it, and if validation was never run.
- try {
- if (marker == null) {
- // Assume default values
- resetToDefault();
- return;
- }
-
- IMarker prjMarker = marker[0]; // getProjectMarker() has already checked that there's a
- // marker in the array
-// GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
-
-// String enabledValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_VALIDATORS);
-// ValidatorMetaData[] enabledVal = null;
-// if (enabledValStr == null) {
-// enabledVal = gp.getEnabledValidators();
-// } else {
-// enabledVal = getStringAsEnabledElementsArray(enabledValStr);
-// }
-// setEnabledValidators(enabledVal);
-
- ValidatorMetaData[] enabledManaualVal = null;
- ValidatorMetaData[] enabledBuildVal = null;
- String enabledManualValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- String enabledBuildValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
-// ValidatorMetaData[] enabledVal = null;
-// if (enabledManualValStr.equals(null) || enabledBuildValStr.equals(null)) {
-// enabledVal = gp.getEnabledValidators();
-// } else {
- if (!enabledManualValStr.equals(null) && !enabledBuildValStr.equals(null)) {
- enabledManaualVal = getStringAsEnabledElementsArray(enabledManualValStr);
- setEnabledManualValidators(enabledManaualVal);
- enabledBuildVal = getStringAsEnabledElementsArray(enabledManualValStr);
- setEnabledBuildValidators(enabledBuildVal);
- }
-
- String version = loadVersion(marker); // In 4.03, every project had its own validators &
- // auto-validate settings.
- Boolean boolVal = (Boolean) getValue(prjMarker, ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- if ((boolVal == null) && (version.equals(ConfigurationConstants.VERSION4_03))) {
- // Different default for 4.03. In 4.03, all projects overrode the global, because
- // the
- // global preferences didn't exist.
- setDoesProjectOverride(true);
- } else if (boolVal == null) {
- setDoesProjectOverride(getDoesProjectOverrideDefault());
- } else {
- setDoesProjectOverride(boolVal.booleanValue());
- }
-
- getResource().getWorkspace().deleteMarkers(marker);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- protected void copyTo(ProjectConfiguration prjp) throws InvocationTargetException {
- super.copyTo(prjp);
-
- // Need to have a distinct method for this child class (i.e., the parameter
- // is not a ValidationConfiguration) because if this initialization is
- // called as part of ValidationConfiguration's constructor, then the value of
- // this field is overwritten. Fields of this class are initialized to the
- // default after the ValidationConfiguration parent is created.
- prjp.setDoesProjectOverride(doesProjectOverride());
- }
-
- public static boolean getDoesProjectOverrideDefault() {
- return PRJ_OVERRIDEGLOBAL_DEFAULT;
- }
-
- /**
- * Return true if the enabled validators have not changed since this ValidationConfiguration was
- * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
- * if the list of validators hasn't changed, then there is no need to update the task list;
- * updating the task list is a costly operation.)
- *
- * The "allow" parameter represents whether or not the global "allow projects to override" has
- * been changed: - TRUE means that the preference "allow" parameter has been changed - FALSE
- * means that the preference "allow" paramter has not been changed
- */
- public boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd, boolean allow) throws InvocationTargetException {
- // First check the obvious: is every enabled validator still enabled, and is
- // the number of enabled validators the same as it was before? If not, return true.
- if (super.hasEnabledValidatorsChanged(oldEnabledVmd)) {
- return true;
- }
-
-
- // If the global preference validators have changed, does the task list need to be updated?
- // PREF | PROJ | UPDATE
- // ALLOW | OVERRIDE | TASK LIST
- //------------------------------
- // 0 | 0 | 1
- // 0 | 1 | 1
- // 1 | 0 | 1
- // 1 | 1 | 0
- //
- // If the global "allow" preference changes from "allow" to "don't allow", or vice versa,
- // and the project overrides the preferences, and the validators differ between the project
- // and the preferences, then the task list must be updated.
- if (allow) {
- // "allow" has changed, so see if the preference and the project validators match.
- ValidatorMetaData[] projEnabledVmd = super.getEnabledValidators(); // bypass the check
- // for whether the global preferences are to be used or not
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- return gp.hasEnabledValidatorsChanged(projEnabledVmd);
- }
-
- return false;
- }
-
- public boolean haveDelegatesChanged(Map<String, String> oldDelegates, boolean allow) throws InvocationTargetException {
-
- if (super.haveDelegatesChanged(oldDelegates)) {
- return true;
- }
-
- if (allow) {
- Map<String, String> projDelegates = super.getDelegatingValidators();
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- return gp.haveDelegatesChanged(projDelegates);
- }
-
- return false;
- }
-
-
- public void deserialize(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- resetToDefault();
- } else if (storedConfiguration != null) {
- int prjOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if (disableAllValidationIndex != -1) {
- String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(), versionIndex);
- setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
- } else {
- setDisableAllValidation(false);
- }
- // project doesn't override the global
- if (disableAllValidationIndex != -1) {
- String prjOverride = storedConfiguration.substring(prjOverrideIndex + ConfigurationConstants.PRJ_OVERRIDEGLOBAL.length(), disableAllValidationIndex);
- setDoesProjectOverride(Boolean.valueOf(prjOverride).booleanValue());
- }
- }
- }
-
- public String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
- buffer.append(String.valueOf(doesProjectOverride()));
- if (doesProjectOverride()) {
- // Store common values for the Project configuration only if they differ from the global
- buffer.append(super.serialize());
- }
- return buffer.toString();
- }
-
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource());
- }
- return super.getEnabledFullBuildValidators(fullBuild);
- }
-
- /**
- * Given a set of validators, usually the global preference set, change the set so that it
- * contains only the validators configured on this project.
- */
- private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource, boolean onlyReferenced) {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- int length = (vmds == null) ? 0 : vmds.length;
- ValidatorMetaData[] temp = new ValidatorMetaData[length];
- if (length == 0) {
- return temp;
- }
-
- int count = 0;
- IProject project = (IProject) resource;
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (reader.isConfiguredOnProject(vmd, project)) {
- if (!onlyReferenced || vmd.isDependentValidator())
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- temp = null;
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledFullBuildValidators(boolean)
- */
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild, boolean onlyReferenced) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource(), onlyReferenced);
- }
- return super.getEnabledFullBuildValidators(fullBuild, onlyReferenced);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getIncrementalValidators()
- */
- public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getIncrementalValidators(), getResource());
- }
- return super.getIncrementalValidators();
- }
-
- public int numberOfManualValidators() throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().numberOfManualEnabledValidators();
- }
- return super.numberOfManualEnabledValidators();
- }
- public boolean isDisableAllValidation() throws InvocationTargetException{
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().isDisableAllValidation();
- }
- return super.isDisableAllValidation();
- }
-
- public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd) throws InvocationTargetException {
- if (useGlobalPreference()) {
- return ConfigurationManager.getManager().getGlobalConfiguration().getDelegateDescriptor(vmd);
- }
-
- return super.getDelegateDescriptor(vmd);
- }
-
- public void store() throws InvocationTargetException {
- IProject project = (IProject) getResource();
- final PreferencesWrapper pref = PreferencesWrapper.getPreferences(project, null);
- if (pref != null) {
- try {
- pref.put(ValidationConfiguration.UserPreference, serialize());
- pref.put(ValidationConfiguration.UserManualPreference, serializeManualSetting());
- pref.put(ValidationConfiguration.UserBuildPreference, serializeBuildSetting());
- pref.put(ValidationConfiguration.DelegatesPreference, serializeDelegatesSetting());
- pref.flush();
- } catch (BackingStoreException e) {
- // A common error is that the project has been closed, in which case there
- // is nothing that we can do.
- if (project.isAccessible())ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- protected void loadPreference() throws InvocationTargetException {
- IProject project = (IProject) getResource();
- final PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
- if (prefs.nodeExists()) {
- String storedConfig = prefs.get(ValidationConfiguration.UserPreference, DefaultValue);
- deserialize(storedConfig);
- String storedManualConfig = prefs.get(ValidationConfiguration.UserManualPreference, DefaultValue);
- deserializeManual(storedManualConfig);
- String storedBuildConfig = prefs.get(ValidationConfiguration.UserBuildPreference, DefaultValue);
- deserializeBuild(storedBuildConfig);
- String storedDelegatesConfiguration = prefs.get(ValidationConfiguration.DelegatesPreference, DefaultValue);
- deserializeDelegates(storedDelegatesConfiguration);
- }
- }
-
- /**
- * Answer the validator id's that have been enabled for manual validation.
- * @return null if they are all enabled
- */
- Set<String> getEnabledManualValidators(){
- return getIds(ValidationConfiguration.UserManualPreference, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- }
-
- /**
- * Answer the validator id's that have been enabled for build validation.
- * @return null if they are all enabled
- */
- Set<String> getEnabledBuildlValidators(){
- return getIds(ValidationConfiguration.UserBuildPreference, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
- }
-
- /**
- * A helper method to extract some validator id's from a preference store field.
- *
- * @return null if all the validators are enabled.
- */
- private Set<String> getIds(String prefKey, String enabledPhrase){
- IProject project = (IProject) getResource();
- final PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
- if (prefs == null)return null;
-
- String storedConfig = prefs.get(prefKey, DefaultValue);
- if (storedConfig == null || storedConfig.length() == 0 || storedConfig.equals(DefaultValue))return null;
- int validationIndex = storedConfig.indexOf(enabledPhrase);
-
- String ids = storedConfig.substring(validationIndex + enabledPhrase.length(),storedConfig.length());
-
- StringTokenizer tokenizer = new StringTokenizer(ids, ConfigurationConstants.ELEMENT_SEPARATOR);
- Set<String> set = new HashSet<String>(20);
- while (tokenizer.hasMoreTokens())set.add(tokenizer.nextToken());
- if (set.size() == 0)return null;
-
- return set;
-
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
deleted file mode 100644
index d638d0a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
+++ /dev/null
@@ -1,88 +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
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorExtension {
- private String id = null;
- private ReferencialFileValidator instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
-
- /** referencialFileValidator */
- public static final String REF_FILE_VALIDATOR_EXTENSION = "referencialFileValidator"; //$NON-NLS-1$
-
- /** run */
- public static final String RUN = "run"; //$NON-NLS-1$
-
- /** id */
- public static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** class */
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- public ReferencialFileValidatorExtension() {
- super();
- }
-
- public ReferencialFileValidator getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (ReferencialFileValidator) element.createExecutableExtension(RUN);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- errorCondition = true;
- }
- return instance;
- }
-
- public ReferencialFileValidatorExtension(IConfigurationElement element) {
- if(!REF_FILE_VALIDATOR_EXTENSION.equals(element.getName()))
- throw new IllegalArgumentException("Extensions must be of the type \"" + REF_FILE_VALIDATOR_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- public IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
deleted file mode 100644
index c9233ef..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
+++ /dev/null
@@ -1,150 +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
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorRegistryReader {
- static ReferencialFileValidatorRegistryReader instance;
-
- private static final String Id = "id"; //$NON-NLS-1$
- private static final String ExtensionPoint = "referencialFileValidator"; //$NON-NLS-1$
-
- protected List<ReferencialFileValidatorExtension> referencialFileValidationExtensions;
-
- public ReferencialFileValidatorRegistryReader() {
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(Id, ExtensionPoint);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (ReferencialFileValidatorExtension.REF_FILE_VALIDATOR_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param newExtension
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
-
- //add to the list of post validator extensions only if the extension is not added yet
- boolean containsExt = true;
- for(ReferencialFileValidatorExtension ext : getReferencialFileValidationExtensions()) {
- if(!ext.getElement().getAttribute(Id).equals(newExtension.getAttribute(Id)))containsExt = false;
- }
- if(!containsExt ||getReferencialFileValidationExtensions().isEmpty())
- getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
-
- getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param newExtension
- * The extensions to set
- */
- protected void addExtensionPoint(ReferencialFileValidatorExtension newExtension) {
- if (referencialFileValidationExtensions == null)
- referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
- referencialFileValidationExtensions.add(newExtension);
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public ReferencialFileValidator getReferencialFileValidator() {
- for (ReferencialFileValidatorExtension refFileValExt: getReferencialFileValidationExtensions()) {
- return refFileValExt.getInstance();
- }
- return null;
- }
-
- /**
- * Gets the singleton instance.
- */
- public static ReferencialFileValidatorRegistryReader getInstance() {
- if (instance == null) {
- instance = new ReferencialFileValidatorRegistryReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List<ReferencialFileValidatorExtension> getReferencialFileValidationExtensions() {
- if (referencialFileValidationExtensions == null)
- referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
- return referencialFileValidationExtensions;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
deleted file mode 100644
index 81a78b4..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
+++ /dev/null
@@ -1,140 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Validation constants needed to declare an extension point, and to implement an extension.
- */
-public interface RegistryConstants {
- String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
-
- /** validator - extension point declaration of the validator */
- String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$
-
- /** run - identifies the Validator class */
- String TAG_RUN_CLASS = "run"; //$NON-NLS-1$
-
- /**
- * filter - identifies a filter -- type and/or name -- used to filter out resources which are
- * not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.)
- */
- String TAG_FILTER = "filter"; //$NON-NLS-1$
-
- /**
- * identifies a filter -- type and/or name -- used to filter out resources which are not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.)
- */
- String TAG_CONTENTTYPE = "contentTypeBinding"; //$NON-NLS-1$
-
- /**
- * identifies a type
- */
- String ATT_CONTENTTYPEID = "contentTypeId"; //$NON-NLS-1$
- /** helper - IValidationContext which loads the MOF model for the IValidator */
- String TAG_HELPER_CLASS = "helper"; //$NON-NLS-1$
-
- /** projectNature - identifies the projects which the validator should run on */
- String TAG_PROJECT_NATURE = "projectNature"; //$NON-NLS-1$
-
- /**
- * aggregateValidator - identifies a validator(s) which this validator aggregates. This value is used
- * to remove all messages owned by a particular validator. Aggregate validators cannot be shared.
- * only one validator may use an aggregate of that type. */
- String TAG_AGGREGATE_VALIDATORS = "aggregateValidator"; //$NON-NLS-1$
-
- /** objectClass - identifies a type */
- String ATT_OBJECT_CLASS = "objectClass"; //$NON-NLS-1$
-
- /** nameFilter - identifies a name (may include the '*' wildcard anywhere in the name) */
- String ATT_NAME_FILTER = "nameFilter"; //$NON-NLS-1$
-
- /** id - identifies a unique id to filter on */
- String ATT_ID = "id"; //$NON-NLS-1$
-
- /** class - identifies a class name of a tag, e.g. "helper class", or "run class" */
- String ATT_CLASS = "class"; //$NON-NLS-1$
-
- /** action - identifies the incremental validation actions for which a resource should be filtered in */
- String ATT_ACTION_FILTER = "action"; //$NON-NLS-1$
-
- /**
- * incremental - identifies whether or not the validator supports incremental build validation.
- * Default is true (i.e., incremental builds are supported).
- */
- String ATT_INCREMENTAL = "incremental"; //$NON-NLS-1$
-
- /** true - The incremental default. */
- boolean ATT_INCREMENTAL_DEFAULT = true;
-
- /**
- * fullBuild - identifies whether or not the validator supports full build validation.
- * Default is true (i.e., full build validation is supported).
- */
- String ATT_FULLBUILD = "fullBuild"; //$NON-NLS-1$
-
- /** true - The build default. */
- boolean ATT_FULLBUILD_DEFAULT = true;
-
- /** enabled - identifies whether or not the validator is enabled by default. Default is "true" (enabled). */
- String ATT_ENABLED = "enabled"; //$NON-NLS-1$
-
- /** true - The "enabled" default. */
- boolean ATT_ENABLED_DEFAULT = true;
-
- /** include - Include projects with this nature */
- String ATT_INCLUDE = "include"; //$NON-NLS-1$
-
- /**
- * true - By default, if "include" is not specified in the projectNature element,
- * then assume that the nature is included. */
- boolean ATT_INCLUDE_DEFAULT = true;
-
- /**
- * ruleGroup - identifies the different validation passes which this validator recognizes.
- * The values are identified in IRuleGroup.
- */
- String ATT_RULE_GROUP = "ruleGroup"; //$NON-NLS-1$
-
- /** the default pass includes only the FAST PASS. FULL can be invoked only explicitly by an operation. */
- int ATT_RULE_GROUP_DEFAULT = IRuleGroup.PASS_FAST;
-
- /** caseSensitive */
- String ATT_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
-
- /** async - Is the validator thread-safe? */
- String ATT_ASYNC = "async"; //$NON-NLS-1$
-
- /** false - The "can validator run asynchronously" default. In the future this may be changed to true. */
- boolean ATT_ASYNC_DEFAULT = false;
-
- /** migrate - the "migrate" section of the validator */
- String TAG_MIGRATE = "migrate"; //$NON-NLS-1$
-
- /** validator - the "validator" element of the "migrate" section */
- String TAG_VALIDATOR = "validator"; //$NON-NLS-1$
-
- /** from - the fully-qualified class name of the former validator class */
- String ATT_FROM = "from"; //$NON-NLS-1$
-
- /** to - the fully-qualified class name of the current validator class */
- String ATT_TO = "to"; //$NON-NLS-1$
- String DEP_VALIDATOR = "dependentValidator"; //$NON-NLS-1$
- String DEP_VAL_VALUE = "depValValue"; //$NON-NLS-1$
- String MARKER_ID = "markerId"; //$NON-NLS-1$
- String MARKER_ID_VALUE = "markerIdValue"; //$NON-NLS-1$
- boolean DEP_VAL_VALUE_DEFAULT = false;
- String FACET = "facet"; //$NON-NLS-1$
- String FACET_ID ="facetId"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
deleted file mode 100644
index 62f8a08..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
+++ /dev/null
@@ -1,119 +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;
-
-
-
-/**
- * Constants used to access the string resources associated with the plug-in.
- *
- * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
- */
-public interface ResourceConstants {
- // A marker cannot be added to the task list.
- String VBF_EXC_CANNOT_ADD_MARKER = "VBF_EXC_CANNOT_ADD_MARKER"; //$NON-NLS-1$
-
- // A marker cannot be removed from the task list.
- String VBF_EXC_CANNOT_REMOVE_MARKER = "VBF_EXC_CANNOT_REMOVE_MARKER"; //$NON-NLS-1$
-
- // Internal error has occurred.
- String VBF_EXC_INTERNAL = "VBF_EXC_INTERNAL"; //$NON-NLS-1$
-
- // If the validator cannot be loaded because it didn't specify a helper
- String VBF_EXC_HELPER_MISSING = "VBF_EXC_HELPER_MISSING"; //$NON-NLS-1$
-
- // If the validator cannot be loaded because its helper cannot be loaded
- String VBF_EXC_HELPER_CANNOTLOAD = "VBF_EXC_HELPER_CANNOTLOAD"; //$NON-NLS-1$
-
- // A java.lang.Runtime error has occurred during the build.
- String VBF_EXC_RUNTIME = "VBF_EXC_RUNTIME"; //$NON-NLS-1$
-
- // If the "Validator" extension point has been removed from the plugin.xml file.
- String VBF_EXC_MISSING_VALIDATOR_EP = "VBF_EXC_MISSING_VALIDATOR_EP"; //$NON-NLS-1$
-
- // If the user has specified an invalid type filter in their plugin.xml file.
- // i.e., it isn't an instance of IResource.
- String VBF_EXC_INVALID_TYPE_FILTER = "VBF_EXC_INVALID_TYPE_FILTER"; //$NON-NLS-1$
-
- // The validator extension has made a mistake in its plugin.xml's projectNature tag
- String VBF_EXC_MISSING_PROJECTNATURE_ID = "VBF_EXC_MISSING_PROJECTNATURE_ID"; //$NON-NLS-1$
-
- // The validator extension has made a mistake in its plugin.xml's syntax.
- String VBF_EXC_VALIDATORNAME_IS_NULL = "VBF_EXC_VALIDATORNAME_IS_NULL"; //$NON-NLS-1$
-
- // Title for the IProgressMonitor.
- String VBF_STATUS_PROGRESSMONITOR_TITLE = "VBF_STATUS_PROGRESSMONITOR_TITLE"; //$NON-NLS-1$
-
- // Status line for the IProgressMonitor
- String VBF_STATUS_INITIALIZING = "VBF_STATUS_INITIALIZING"; //$NON-NLS-1$
-
- // If the user has cancelled validation, each validator might have cleanup to do. This message
- // is shown to tell the user which validator is being cleaned up at the moment.
- String VBF_STATUS_VALIDATOR_CLEANUP = "VBF_STATUS_VALIDATOR_CLEANUP"; //$NON-NLS-1$
-
- // If the user cancelled validation, remove all of the validator's tasks from the task list, and
- // put an entry saying that validation on {project} using {validator} was cancelled.
- String VBF_STATUS_VALIDATOR_TERMINATED = "VBF_STATUS_VALIDATOR_TERMINATED"; //$NON-NLS-1$
-
- // Before a validator is begun, this message informs the user that validation, using a
- // particular validator, has begun
- String VBF_STATUS_STARTING_VALIDATION = "VBF_STATUS_STARTING_VALIDATION"; //$NON-NLS-1$
-
- // After a validator is finished, this message informs the user that validation, using a
- // particular validator, has completed.
- String VBF_STATUS_ENDING_VALIDATION = "VBF_STATUS_ENDING_VALIDATION"; //$NON-NLS-1$
-
- // If a validator throws an unchecked exception, this message is displayed to the user.
- String VBF_STATUS_ENDING_VALIDATION_ABNORMALLY = "VBF_STATUS_ENDING_VALIDATION_ABNORMALLY"; //$NON-NLS-1$
-
- // If the build's getDelta(getProject()) method returns null, let the user know that a full
- // validation will be performed because there's no delta information.
- String VBF_STATUS_NULL_DELTA = "VBF_STATUS_NULL_DELTA"; //$NON-NLS-1$
-
- String VBF_EXC_SYNTAX_NO_HELPER = "VBF_EXC_SYNTAX_NO_HELPER"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_HELPER_CLASS = "VBF_EXC_SYNTAX_NO_HELPER_CLASS"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_HELPER_THROWABLE = "VBF_EXC_SYNTAX_NO_HELPER_THROWABLE"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_VAL_THROWABLE = "VBF_EXC_SYNTAX_NO_VAL_THROWABLE"; //$NON-NLS-1$
- String VBF_EXC_INVALID_RESOURCE = "VBF_EXC_INVALID_RESOURCE"; //$NON-NLS-1$
-
- String VBF_EXC_NULLCREATE = "VBF_EXC_NULLCREATE"; //$NON-NLS-1$
- String VBF_EXC_NULLSAVE = "VBF_EXC_NULLSAVE"; //$NON-NLS-1$
- String VBF_EXC_SAVE = "VBF_EXC_SAVE"; //$NON-NLS-1$
- String VBF_EXC_NULLRETRIEVE = "VBF_EXC_NULLRETRIEVE"; //$NON-NLS-1$
- String VBF_EXC_RETRIEVE = "VBF_EXC_RETRIEVE"; //$NON-NLS-1$
-
- String VBF_EXC_BADVMD = "VBF_EXC_BADVMD"; //$NON-NLS-1$
- String VBF_EXC_OPENPRJ = "VBF_EXC_OPENPRJ"; //$NON-NLS-1$
- String VBF_EXC_EXISTPRJ = "VBF_EXC_EXISTPRJ"; //$NON-NLS-1$
- String VBF_EXC_BADPRJ = "VBF_EXC_BADPRJ"; //$NON-NLS-1$
- String VBF_EXC_MULTIPRJ = "VBF_EXC_MULTIPRJ"; //$NON-NLS-1$
- String VBF_EXC_BADVAL = "VBF_EXC_BADVAL"; //$NON-NLS-1$
-
- String VBF_STATUS_START_REMOVING_OLD_MESSAGES = "VBF_STATUS_START_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$
- String VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES = "VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$
-
- String VBF_TASK_WARN_MESSAGE_LIMIT_VAL = "VBF_TASK_WARN_MESSAGE_LIMIT_VAL"; //$NON-NLS-1$
-
- String VBF_VALIDATION_JOB_MSG = "VBF_VALIDATION_JOB_MSG"; //$NON-NLS-1$
-
- String VBF_EXC_DISABLEV = "VBF_EXC_DISABLEV"; //$NON-NLS-1$
- String VBF_EXC_DISABLEH = "VBF_EXC_DISABLEH"; //$NON-NLS-1$
- String VBF_EXC_ORPHAN_IVALIDATOR = "VBF_EXC_ORPHAN_IVALIDATOR"; //$NON-NLS-1$
-
- String VBF_STATUS_LOOKING = "VBF_STATUS_LOOKING"; //$NON-NLS-1$
- String VBF_STATUS_LOOKINGDONE = "VBF_STATUS_LOOKINGDONE"; //$NON-NLS-1$
- String VBF_STATUS_REMOVING = "VBF_STATUS_REMOVING"; //$NON-NLS-1$
- String VBF_STATUS_REMOVINGDONE = "VBF_STATUS_REMOVINGDONE"; //$NON-NLS-1$
-
- String VBF_WRONG_CONTEXT_FOR_DELEGATE = "VBF_WRONG_CONTEXT_FOR_DELEGATE"; //$NON-NLS-1$
- String VBF_NO_DELEGATE = "VBF_NO_DELEGATE"; //$NON-NLS-1$
- String VBF_CANNOT_INSTANTIATE_DELEGATE = "VBF_CANNOT_INSTANTIATE_DELEGATE"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
deleted file mode 100644
index c3d2f7e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
+++ /dev/null
@@ -1,76 +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;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class retrieves the Strings from the .properties file appropriate for the machine's Locale.
- */
-public class ResourceHandler {
- //TODO Make this class final once the public ResourceHandler has been deleted.
- private static ResourceBundle _bundle = null;
-
- protected ResourceHandler() {
- //TODO Make this method private once the public ResourceHandler has been deleted.
- super();
- }
-
- /**
- * Return the resource bundle which contains the messages, as identified by
- */
- public static ResourceBundle getBundle() {
- if (_bundle == null) {
- try {
- _bundle = ResourceBundle.getBundle(ValidationPlugin.getBundlePropertyFileName());
- } catch (MissingResourceException exc) {
- _bundle = null;
- if (Tracing.isLogging()) {
- Tracing.log("ResourceHandler-01", "Cannot find bundle " + ValidationPlugin.getBundlePropertyFileName()); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
- return _bundle;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- ResourceBundle bundle = getBundle();
- if (bundle == null) {
- Tracing.log("ResourceHandler-02: ", "Resource bundle is null"); //$NON-NLS-1$ //$NON-NLS-2$
- return key;
- }
-
- return bundle.getString(key);
- } catch (NullPointerException exc) {
- Tracing.log("ResourceHandler-03: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return key;
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), (Object[])parms);
- } catch (MissingResourceException exc) {
- Tracing.log("ResourceHandler-04: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (NullPointerException exc) {
- if (Tracing.isLogging()) {
- Tracing.log("ResourceHandler-05: Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- return res;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
deleted file mode 100644
index 1cae3c1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
+++ /dev/null
@@ -1,451 +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;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This class must be called only by the validation framework.
- *
- * This singleton interacts with the eclipse workbench's Task list. TaskListUtility adds and removes
- * tasks from the list.
- *
- * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
- * resource deltas can be generated by the methods in this class.
- */
-public class TaskListUtility implements ConfigurationConstants {
- protected static final int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
- protected static final int DEPTH_ZERO = IResource.DEPTH_ZERO;
- protected static final String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$
- private final static IMarker[] NO_MARKERS = new IMarker[0];
-
- public static IWorkspaceRoot getRoot() {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- return root;
- }
-
- /**
- * This method is here for use by the SABER validator's reporter instance ONLY. Do not use. See
- * defect 260144 for details.
- */
- @SuppressWarnings("unchecked")
- public static IMarker setPriority(IMarker item, int priority) throws CoreException {
- Map attrib = item.getAttributes();
- attrib.put(IMarker.PRIORITY, new Integer(priority));
- item.setAttributes(attrib);
- return item;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public static IMarker addTask(String pluginId, IResource resource, String location,
- String messageId, String message, int markerType, String markerName, String targetObjectName,
- String groupName, int offset, int length) throws CoreException {
-
- if ((message == null) || (resource == null) || (!resource.exists())) {
- return null;
- }
-
- int severity = getSeverity(markerType);
-
- // Allow duplicate entries in the task list.
- // Prior to a full validation, the validation framework will remove all messages owned
- // by a validator before it is executed.
- // Prior to an incremental validation, the validation framework will remove all messages,
- // on each of the changed resources, owned by a validator before it is invoked.
- //
- // It is up to the validator to make sure that it is not adding the same message
- // in more than one place, and also to clear out any old messages which are not cleared
- // by the validation framework.
- IMarker item = null;
- MarkerManager.getDefault().hook(resource);
- if(markerName != null && markerName.length() >0 )
- item = resource.createMarker(markerName); // add a validation marker
- else
- item = resource.createMarker(VALIDATION_MARKER); // add a validation marker
-
- // For performance reasons, replace the multiple setAttribute
- // calls above with a single setAttributes call.
- boolean offsetSet = ((offset != IMessage.OFFSET_UNSET) && (length != IMessage.OFFSET_UNSET));
- int size = (offsetSet) ? 10 : 8; // add CHAR_START, CHAR_END only if the offset is set. If
- // the offset is set, it takes precendence over the line
- // number. (eclipse's rule, not mine.)
- String[] attribNames = new String[size];
- Object[] attribValues = new Object[size];
-
- // Very first thing, add the owner. That way, if the code dies
- // before things are persisted, hopefully this marker will be persisted.
- // Hopefully, eclipse WILL persist this field, as requested.
- attribNames[0] = VALIDATION_MARKER_OWNER;
- attribValues[0] = pluginId;
- attribNames[1] = VALIDATION_MARKER_SEVERITY; // this validation severity is stored, in
- // addition to the marker severity, to enable
- // more than one severity of message to be
- // displayed. e.g. ERROR | WARNING (using
- // binary OR). The IMarker constants are
- // regular decimal constants.
- attribValues[1] = new Integer(markerType);
- attribNames[2] = VALIDATION_MARKER_TARGETOBJECT; // to distinguish between messages which
- // are registered on an IResource, but
- // against different target objects
- attribValues[2] = ((targetObjectName == null) ? "" : targetObjectName); //$NON-NLS-1$
- attribNames[3] = VALIDATION_MARKER_GROUP;
- attribValues[3] = ((groupName == null) ? "" : groupName); //$NON-NLS-1$
- attribNames[4] = IMarker.MESSAGE;
- attribValues[4] = message;
- attribNames[5] = VALIDATION_MARKER_MESSAGEID;
- attribValues[5] = messageId;
-
- attribNames[6] = IMarker.SEVERITY; // IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING,
- // IMarker.SEVERITY_INFO
- attribValues[6] = new Integer(severity);
- try {
- // If the location is a line number, store it as a line number
- Integer lineNumber = Integer.valueOf(location);
- attribNames[7] = IMarker.LINE_NUMBER;
- attribValues[7] = lineNumber;
- } catch (NumberFormatException exc) {
- // Otherwise, store it as a text location
- attribNames[7] = IMarker.LOCATION;
- attribValues[7] = location;
- }
-
- if (offsetSet) {
- attribNames[8] = IMarker.CHAR_START;
- attribValues[8] = new Integer(offset);
- attribNames[9] = IMarker.CHAR_END;
- attribValues[9] = new Integer(offset + length);
- }
-
- item.setAttributes(attribNames, attribValues);
-
- return item;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public static IMarker addTask(String pluginId, IResource resource, String location,
- String messageId, String message, int markerType, String targetObjectName,
- String groupName, int offset, int length) throws CoreException {
-
- return addTask(pluginId, resource, location, messageId,
- message, markerType, null, targetObjectName, groupName, offset, length);
- }
-
- /**
- * Given one of the SeverityEnum severities, return the IMarker severity int that is its
- * equivalent.
- *
- * This method was made public for the SaberReporter. No one other than TaskListUtility, or the
- * SaberReporter, should use this method!
- *
- */
- private static int getSeverity(int severityEnumValue) {
- switch (severityEnumValue) {
- case (IMessage.HIGH_SEVERITY) : {
- return IMarker.SEVERITY_ERROR;
- }
-
- case (IMessage.LOW_SEVERITY) : {
- return IMarker.SEVERITY_INFO;
- }
-
- case (IMessage.NORMAL_SEVERITY) : {
- return IMarker.SEVERITY_WARNING;
- }
-
- case (IMessage.ALL_MESSAGES) :
- case (IMessage.ERROR_AND_WARNING) :
- default : {
- // assume it's a warning.
- return IMarker.SEVERITY_WARNING;
- }
- }
- }
-
- private static int getDepth(IResource resource) {
- if (resource instanceof IProject) {
- return DEPTH_INFINITE; // DEPTH_INFINITE means get this project's markers, and the
- // markers belonging to the project's children.
- } else if (resource instanceof IWorkspaceRoot) {
- // Needed for the ValidationMigrator when it checks for orphan tasks.
- return DEPTH_INFINITE; // DEPTH_INFINITE means get all of the markers in the workspace
- }
-
- return DEPTH_ZERO; // DEPTH_ZERO means just this resource, not its children
- }
-
- public static IMarker[] getValidationTasks(int severity, IProject project) {
- // DEPTH_INFINITE means get this project's markers, and the markers
- // belonging to the project's children.
- return getValidationTasks(project, severity);
- }
-
- public static IMarker[] getValidationTasks(IResource resource, int severity) {
- return getValidationTasks(resource, severity, getDepth(resource));
- }
-
- /**
- * Return true if the marker is owned by the ownerId.
- */
- public static boolean isOwner(IMarker marker, String ownerId) {
- try {
- Object owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- return false;
- }
-
- return ((String) owner).equals(ownerId);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return false;
- }
- }
-
- private static IMarker[] getValidationTasks(IResource resource, int severity, int depth) {
- IMarker[] tempMarkers = null;
- int validCount = 0;
- IMarker[] allMarkers = null;
- try {
- allMarkers = resource.findMarkers(VALIDATION_MARKER, true, depth);
- } catch (CoreException e) {
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
- return NO_MARKERS;
- }
-
- // Now filter in the markers, based on severity type.
- if (allMarkers.length != 0) {
- tempMarkers = new IMarker[allMarkers.length];
- for (IMarker marker : allMarkers) {
- Integer filterSeverity = null;
- try {
- filterSeverity = (Integer) marker.getAttribute(VALIDATION_MARKER_SEVERITY);
- }
- catch (CoreException e){
- // Someone may have deleted the marker on us. All we can do is skip it.
- continue;
- }
- if (filterSeverity == null) {
- // odd...marker wasn't created correctly. How could this happen?
- // Default to the current severity and add it to the list.
- try {
- // 226541 - I was seeing markers with valid severities being reset, so I added this
- // additional test.
- if (marker.getAttribute(IMarker.SEVERITY, -1) == -1)
- marker.setAttribute(IMarker.SEVERITY, getSeverity(severity));
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- } else if ((severity & filterSeverity.intValue()) == 0) {
- continue;
- }
- tempMarkers[validCount++] = marker;
- }
- }
-
- if (validCount == 0) {
- return NO_MARKERS;
- }
-
- IMarker[] validMarkers = new IMarker[validCount];
- System.arraycopy(tempMarkers, 0, validMarkers, 0, validCount);
- return validMarkers;
- }
-
- public static IMarker[] getValidationTasks(IResource resource, String messageOwner) {
- return getValidationTasks(resource, new String[]{messageOwner}, getDepth(resource));
- }
-
- public static IMarker[] getValidationTasks(IResource resource, String[] messageOwners) {
- return getValidationTasks(resource, messageOwners, getDepth(resource));
- }
-
- private static IMarker[] getValidationTasks(IResource resource, String[] messageOwners, int depth) {
- IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES, depth);
- if (markers.length == 0)return NO_MARKERS;
-
- IMarker[] temp = new IMarker[markers.length];
- int validCount = 0;
- for (IMarker marker : markers) {
- Object owner = null;
- try {
- owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
- } catch (CoreException e) {
- // eat it -- if it no longer exists there is nothing we can do about it
- }
-
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- continue;
- }
-
- for (String messageOwner : messageOwners) {
- if (((String) owner).equals(messageOwner)) {
- temp[validCount++] = marker;
- break;
- }
- }
- }
-
- if (validCount == 0)return NO_MARKERS;
-
- IMarker[] result = new IMarker[validCount];
- System.arraycopy(temp, 0, result, 0, validCount);
- return result;
- }
-
- /**
- * This method retrieves all validation tasks from the resource. If depth is INFINITE, child
- * tasks are returned as well. Only the tasks which are owned by the specified messageOwner, and
- * apply to the named IMessage's target object (objectName) will be returned.
- */
- private static IMarker[] getValidationTasks(IResource resource, String[] messageOwner, String objectName, String groupName, int depth) throws CoreException {
- if ((messageOwner == null) || (resource == null)) {
- return NO_MARKERS;
- }
-
- int validCount = 0;
- IMarker[] validList = null;
- IMarker[] markers = getValidationTasks(resource, messageOwner, depth);
- if (markers != null) {
- validList = new IMarker[markers.length];
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
-
- // If more than one target object resolves to the same resource, removing one
- // target's
- // messages should not remove the other target object's messages.
- if (objectName != null) {
- Object targetObject = marker.getAttribute(VALIDATION_MARKER_TARGETOBJECT);
- if ((targetObject == null) || !(targetObject instanceof String) || !(((String) targetObject).equals(objectName))) {
- continue;
- }
- }
-
- if (groupName != null) {
- Object group = marker.getAttribute(VALIDATION_MARKER_GROUP);
- if ((group == null) || !(group instanceof String) || !(((String) group).equals(groupName))) {
- continue;
- }
- }
-
- validList[validCount++] = marker;
- }
- }
-
- if (validCount == 0) {
- return NO_MARKERS;
- }
-
- IMarker[] result = new IMarker[validCount];
- System.arraycopy(validList, 0, result, 0, validCount);
- return result;
- }
-
- /**
- * Remove all validation messages from the resource and its children.
- */
- public static void removeAllTasks(IResource resource) {
- if (resource == null) {
- return;
- }
-
- try {
- IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES);
- ResourcesPlugin.getWorkspace().deleteMarkers(markers);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * This method removes all tasks from the resource. If the resource is an IProject, all tasks
- * are also removed from the project's children.
- */
- public static void removeAllTasks(IResource resource, String[] owners) throws CoreException {
- removeAllTasks(resource, owners, null); // null means remove messages from all target
- // objects
- }
-
- /**
- * This method removes all messages from a resource in the task list.
- */
- public static void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
- removeAllTasks(resource, new String[]{owner}, objectName);
- }
-
- public static void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
- removeAllTasks(resource, owners, objectName, getDepth(resource));
- }
-
- protected static void removeAllTasks(IResource resource, String[] owners, String objectName, int depth) throws CoreException {
- removeTaskSubset(resource, owners, objectName, null, depth); // null means no group name
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- public static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
- removeTaskSubset(resource, owners, objectName, groupName, getDepth(resource));
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- protected static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName, int depth) throws CoreException {
- if ((owners == null) || (resource == null)) {
- return;
- }
-
- IMarker[] allTasks = getValidationTasks(resource, owners, objectName, groupName, depth);
- if (allTasks.length > 0) {
- ResourcesPlugin.getWorkspace().deleteMarkers(allTasks);
- }
- }
-
- /**
- * This method changes all validator markers which are owned by "from" to make their owner "to".
- */
- public static void updateOwner(String from, String to) throws CoreException {
- updateOwner(from, to, getRoot());
- }
-
- /**
- * This method changes all validator markers on the IResource and its children. All markers
- * owned by "from" have their owner reassigned to "to".
- */
- public static void updateOwner(String from, String to, IResource resource) throws CoreException {
- IMarker[] ownedMarkers = getValidationTasks(resource, from);
- if (ownedMarkers == null) {
- return;
- }
-
- for (int i = 0; i < ownedMarkers.length; i++) {
- IMarker marker = ownedMarkers[i];
- marker.setAttribute(VALIDATION_MARKER_OWNER, to);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
deleted file mode 100644
index e9d9b7e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
+++ /dev/null
@@ -1,152 +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;
-
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * This class manages (queue, invoke, etc.) the Runnables that perform the validation for a
- * particular validator.
- */
-public class VThreadManager {
- private static VThreadManager _manager = null;
- private static final int MAX_NUM_OF_RESTART = 5; // the maximum number of times that the thread
- // should attempt to ignore a Throwable and
- // carry on
-
- private Thread _validationThread = null; // This thread checks if the current Runnable is
- // finished, and if so, loads the first Runnable off of
- // the queue and starts it.
- volatile int restart = 0; // how many times has the thread been restarted?
- volatile Jobs _jobs = null;
-
- private VThreadManager() {
- _jobs = new Jobs();
-
- // Start the validation thread to check for queued ValidationOperation
- Runnable validationRunnable = new Runnable() {
- public void run() {
- while (true) {
- try {
- if (restart > MAX_NUM_OF_RESTART) {
- // something has gone seriously, seriously wrong
- String message = "restart = " + restart; //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- break;
- }
-
- Runnable job = getJobs().dequeue(); // If currentRunnable is null, there's
- // nothing on the queue. Shouldn't
- // happen with a semaphore.
- if (job != null) {
- getJobs().setActive(true);
- job.run();
- getJobs().setActive(false);
- }
- } catch (Exception e) {
- restart++;
- getJobs().setActive(false);
- ValidationPlugin.getPlugin().handleException(e);
- } finally {
- //do nothing
- }
- }
- }
- };
-
- _validationThread = new Thread(validationRunnable, "ValidationThread"); //$NON-NLS-1$
- _validationThread.start();
- }
-
- public static VThreadManager getManager() {
- if (_manager == null) {
- _manager = new VThreadManager();
- }
- return _manager;
- }
-
- Jobs getJobs() {
- return _jobs;
- }
-
- public void queue(Runnable runnable) {
- getJobs().queue(runnable);
- }
-
- /**
- * Return true if all of the Runnables have been run.
- */
- public boolean isDone() {
- return getJobs().isDone();
- }
-
- private class Jobs {
- private Vector<Runnable> _queuedJobs; // The queued Runnables that need to be run.
- private boolean _isActive; // Is a job being run in the validation thread?
-
- public Jobs() {
- _queuedJobs = new Vector<Runnable>();
- }
-
- public synchronized void queue(Runnable runnable) {
- // If there is a thread running already, then it must finish before another validation
- // thread is launched, or the validation messages could reflect the last thread
- // finished,
- // instead of the last state of changes.
-
- // Have to wait for the current Runnable to finish, so add this to the end of the queue
- _queuedJobs.add(runnable);
- notifyAll();
- }
-
- /**
- * Pop the Runnable off of the head of the queue.
- */
- synchronized Runnable dequeue() {
- while (_queuedJobs.size() == 0) {
- try {
- wait();
- } catch (InterruptedException exc) {
- //Ignore
- }
- } // Block on the semaphore; break when a job has been added to the queue.
-
- Runnable job = null;
- if (_queuedJobs.size() > 0) {
- job = _queuedJobs.get(0);
- if (job != null) {
- _queuedJobs.remove(0);
- }
- }
- return job;
- }
-
- public synchronized boolean isActive() {
- return _isActive;
- }
-
- public synchronized void setActive(boolean active) {
- _isActive = active;
- }
-
- /**
- * Return true if all of the Runnables have been run.
- */
- public synchronized boolean isDone() {
- return ((_queuedJobs.size() == 0) && !isActive());
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
deleted file mode 100644
index 3ddb087..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
+++ /dev/null
@@ -1,1078 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * This class represents the user's preference or project settings.
- *
- * This class is populated from the multiple persistent properties, and is kept as a session
- * property while the resource is open.
- */
-public abstract class ValidationConfiguration implements IPropertyChangeListener {
- private final IResource _resource;
- private boolean disableAllValidation = getDisableAllValidation();
- private String _version;
-
- /**
- * Map of all validators configured on the project or installed globally. The value of true
- * means that the VMD is enabled, and a value of false means that the VMD is disabled.
- */
- private Map<ValidatorMetaData, Boolean> _validators = new HashMap<ValidatorMetaData, Boolean>();
- protected Map<ValidatorMetaData, Boolean> manualValidators;
- protected Map<ValidatorMetaData, Boolean> buildValidators;
-
- protected static final String UserPreference = "USER_PREFERENCE"; //$NON-NLS-1$
- protected static final String UserBuildPreference = "USER_BUILD_PREFERENCE"; //$NON-NLS-1$
- protected static final String UserManualPreference = "USER_MANUAL_PREFERENCE"; //$NON-NLS-1$
- protected static final String DelegatesPreference = "DELEGATES_PREFERENCE"; //$NON-NLS-1$
-
- // GRK - I am keeping these "constants" in the off chance that they were used somewhere outside the framework
- protected String USER_PREFERENCE = UserPreference;
- protected String USER_MANUAL_PREFERENCE = UserManualPreference;
- protected String USER_BUILD_PREFERENCE = UserBuildPreference;
- protected String DELEGATES_PREFERENCE = DelegatesPreference;
-
- /**
- * The key is the target id, that is the id of the place holder validator. The value is the id
- * of the real validator.
- */
- private Map<String, String> _delegatesByTarget = new HashMap<String, String>();
-
- private static final String DefaultValue = "default_value"; //$NON-NLS-1$
-
- public static String getEnabledElementsAsString(Set<ValidatorMetaData> elements) {
- if (elements == null)return null;
-
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : elements) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- private boolean getDisableAllValidation() {
- return false;
- }
-
- public static String getEnabledElementsAsString(ValidatorMetaData[] elements) {
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : elements) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- public static Set<ValidatorMetaData> getStringAsEnabledElements(String elements) {
- if (elements == null)return null;
-
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens()) {
- String elem = tokenizer.nextToken();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
- if (vmd != null)result.add(vmd);
- }
- return result;
- }
-
- public static ValidatorMetaData[] getStringAsEnabledElementsArray(String elements) {
- if (elements == null)return null;
-
- StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
- ValidatorMetaData[] result = new ValidatorMetaData[tokenizer.countTokens()];
- int count = 0;
- while (tokenizer.hasMoreTokens()) {
- String elem = tokenizer.nextToken();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
- if (vmd != null)result[count++] = vmd;
- }
-
- if (count != result.length) {
- ValidatorMetaData[] trimResult = new ValidatorMetaData[count];
- System.arraycopy(result, 0, trimResult, 0, count);
- return trimResult;
- }
-
- return result;
- }
-
- /**
- * Answer the validators
- * @return
- */
- public static Set<String> getValidatorIdsManual(){
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
- String config = prefs.get(UserManualPreference, null);
- return getValidatorIds(config);
- }
-
- public static Set<String> getValidatorIdsBuild(){
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
- String config = prefs.get(UserBuildPreference, null);
- return getValidatorIds(config);
- }
-
- private static Set<String> getValidatorIds(String elements){
- Set<String> set = new HashSet<String>(50);
- if (elements != null){
- StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens())set.add(tokenizer.nextToken());
- }
- return set;
- }
-
- public static IWorkspaceRoot getRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- protected ValidationConfiguration(IResource resource){
- _resource = resource;
- }
-
- protected ValidationConfiguration(IResource resource, ValidatorMetaData[] validators) throws InvocationTargetException {
- if (resource == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLCREATE));
- }
-
- _resource = resource;
- setValidators(validators);
- }
-
- public boolean isDisableAllValidation() throws InvocationTargetException {
- return disableAllValidation;
- }
-
- public void setDisableAllValidation(boolean allValidation) {
- disableAllValidation = allValidation;
- }
-
- public ValidatorMetaData[] getEnabledValidators() throws InvocationTargetException {
- return getValidators(true);
- }
-
- /**
- * If "incremental" is true, return the enabled incremental validators. If "incremental" is
- * false, return the enabled non-incremental validators.
- */
- public ValidatorMetaData[] getEnabledIncrementalValidators(boolean incremental) throws InvocationTargetException {
- return getEnabledFullBuildValidators(!incremental);
- }
-
- /**
- * If "fullBuild" is true, return the enabled validators that support full builds. If
- * "fullBuild" is false, return the enabled validators that do not support full builds.
- */
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild) throws InvocationTargetException {
- return getEnabledFullBuildValidators(fullBuild, false);
- }
-
- public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild, boolean onlyReferenced) throws InvocationTargetException {
-
- int count = 0;
- ValidatorMetaData[] result = null;
-
- if( !isDisableAllValidation() ){
- Set<ValidatorMetaData> set = getBuildEnabledValidatorsMap().keySet();
- ValidatorMetaData[] temp = new ValidatorMetaData[set.size()];
- for (ValidatorMetaData vmd : set) {
- Boolean bvalue = getBuildEnabledValidatorsMap().get(vmd);
- if (bvalue) {
- // If the validator is enabled
- if (vmd == null)continue;
- if ( vmd.isBuildValidation() ) {
- if (!onlyReferenced || vmd.isDependentValidator())
- temp[count++] = vmd;
- }
- }
- }
- result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- }
- else {
- result = new ValidatorMetaData[0];
- }
- return result;
- }
-
- public void setEnabledValidators(ValidatorMetaData[] vmds) {
- // First, "disable" all validators
- Map<ValidatorMetaData, Boolean> all = getValidatorMetaData();
- for (ValidatorMetaData vmd : all.keySet()) {
- all.put(vmd, Boolean.FALSE);
- }
-
- // Then enable only the validators in the array
- if ((vmds == null) || (vmds.length == 0))return;
-
- for (ValidatorMetaData vmd : vmds) {
- all.put(vmd, Boolean.TRUE);
- }
- }
-
- public void setEnabledManualValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- Set<ValidatorMetaData> manualEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
- for (ValidatorMetaData vmd : vmds)manualEnabledVMDs.add(vmd);
-
- for(ValidatorMetaData data : getValidators()) {
- if(manualEnabledVMDs.contains(data))
- getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
- else
- getManualEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- /**
- * Update the list of validators that have been enabled for manual validation.
- *
- * @param vmds the validators that are enabled for manual validation.
- * @throws InvocationTargetException
- */
- public void setEnabledManualValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
- for(ValidatorMetaData data : getValidators()) {
- if(vmds.contains(data))getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
- else getManualEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- public void setEnabledBuildValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- Set<ValidatorMetaData> buildEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
- for (ValidatorMetaData vmd : vmds)buildEnabledVMDs.add(vmd);
- for(ValidatorMetaData data : getValidators()) {
- if(buildEnabledVMDs.contains(data))
- getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
- else
- getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- /**
- * Update the list of validators that have been enabled for build validation.
- *
- * @param vmds the validators that are enabled for build validation.
- * @throws InvocationTargetException
- */
- public void setEnabledBuildValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
- for(ValidatorMetaData data : getValidators()) {
- if(vmds.contains(data))getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
- else getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);
- }
- }
-
- private Map<ValidatorMetaData, Boolean> getValidatorMetaData() {
- return _validators;
- }
-
-
- public ValidatorMetaData[] getDisabledValidators() throws InvocationTargetException {
- return getValidators(false);
- }
-
- /**
- * Return an array of ValidatorMetaData - if value is false, return the disabled validators; if
- * value is true, return the enabled validators.
- */
- private ValidatorMetaData[] getValidators(boolean value) throws InvocationTargetException {
- ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
- int count = 0;
- for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
- Boolean bvalue = getValidatorMetaData().get(vmd);
- if (bvalue.booleanValue() == value) {
- temp[count++] = vmd;
- }
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- }
-
- public ValidatorMetaData[] getManualEnabledValidators() throws InvocationTargetException {
- Map<ValidatorMetaData, Boolean> map = getManualEnabledValidatorsMap();
- if (!map.isEmpty()) {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
- Boolean obj = me.getValue();
- if (obj != null && obj)list.add(me.getKey());
- }
- return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
- }
- return getEnabledValidators();
- }
-
- public ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
- Map<ValidatorMetaData, Boolean> map = getBuildEnabledValidatorsMap();
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- if (!map.isEmpty()) {
- for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
- Boolean obj = me.getValue();
- if (obj != null && obj)list.add(me.getKey());
- }
- return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
- }
- return getEnabledValidators();
- }
-
- /**
- * Answer the map of the validators that have been enabled for build validation,
- * creating it if necessary.
- */
- protected Map<ValidatorMetaData, Boolean> getBuildEnabledValidatorsMap() {
- if(buildValidators == null)buildValidators = new HashMap<ValidatorMetaData, Boolean>();
- return buildValidators;
- }
-
- /**
- * Answer the map of the validators that have been enabled for manual validation,
- * creating it if necessary.
- */
- protected Map<ValidatorMetaData, Boolean> getManualEnabledValidatorsMap() {
- if(manualValidators == null)manualValidators = new HashMap<ValidatorMetaData, Boolean>();
- return manualValidators;
- }
-
- /**
- * Return all incremental validators for this preference; either every installed validator
- * (global) or every validator configured on the project (project).
- */
- public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
- ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
- int count = 0;
- for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
- Boolean bvalue = getValidatorMetaData().get(vmd);
- if (bvalue && vmd.isIncremental())temp[count++] = vmd;
- }
-
- ValidatorMetaData[] result = new ValidatorMetaData[count];
- System.arraycopy(temp, 0, result, 0, count);
- return result;
- }
-
- /**
- * Return all validators for this preference; either every installed validator (global) or every
- * validator configured on the project (project).
- */
- public ValidatorMetaData[] getValidators() throws InvocationTargetException {
- return convertToArray(_validators.keySet());
- }
-
- public void setValidators(ValidatorMetaData[] vmds) {
- _validators.clear();
- for (ValidatorMetaData vmd : vmds) {
- if (vmd == null)continue;
- _validators.put(vmd, (vmd.isEnabledByDefault() ? Boolean.TRUE : Boolean.FALSE));
- }
- }
-
- public void setDefaultDelegates(ValidatorMetaData[] vmds) throws InvocationTargetException {
- _delegatesByTarget.clear();
- for (ValidatorMetaData vmd : vmds) {
- if (vmd == null)continue;
-
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID);
- if (delegateID == null)continue;
- _delegatesByTarget.put(targetID, ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID));
- }
- }
-
- /**
- * Returns the number of configured validators on the given project or installed validators in
- * the workspace.
- */
- public int numberOfValidators() throws InvocationTargetException {
- return _validators.size();
- }
-
- public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
- return numberOfIncrementalValidators(getEnabledValidators());
- }
-
- public int numberOfIncrementalValidators() throws InvocationTargetException {
- return numberOfIncrementalValidators(getValidators());
- }
-
- private static int numberOfIncrementalValidators(ValidatorMetaData[] vmds) {
- int count = 0;
- for (ValidatorMetaData vmd : vmds) {
- if (vmd.isIncremental())count++;
- }
- return count;
- }
-
- /**
- * Returns the number of enabled validators on the project or workspace.
- */
- public int numberOfEnabledValidators() throws InvocationTargetException {
- return getEnabledValidators().length;
- }
-
- /**
- * Returns the number of disabled validators on the project or workspace.
- */
- public int numberOfDisabledValidators() throws InvocationTargetException {
- return getDisabledValidators().length;
- }
-
- /**
- * The value returned from this method is guaranteed to be non-null.
- */
- public final String getVersion() throws InvocationTargetException {
- if (_version == null)loadVersion();
- return _version;
- }
-
- private void setVersion(String version) {
- _version = version;
- }
-
- /**
- * This preference has been migrated; change the version to the current version.
- * @deprecated dead code.
- */
- public void markVersionCurrent() {
- // The version should not be marked current until the migration is complete
- // (i.e., ValidationMigrator has been invoked.) Migrating the user's configuration
- // is only the first step of the migration.
- setVersion(ConfigurationConstants.CURRENT_VERSION);
- }
-
- public boolean isVersionCurrent() throws InvocationTargetException {
- return getVersion().equals(ConfigurationConstants.CURRENT_VERSION);
- }
-
- // IResource could be an IProject or an IWorkspaceRoot
- public IResource getResource() {
- return _resource;
- }
-
- /**
- * Return true if the validator is enabled on this preference.
- */
- public boolean isEnabled(String validatorClassName) throws InvocationTargetException {
- if (validatorClassName == null) {
- return false;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorClassName);
- return isEnabled(vmd);
- }
-
- /**
- * Return true if the validator is enabled on this preference.
- */
- public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
- if (vmd == null)return false;
-
- Boolean value = getValidatorMetaData().get(vmd);
- if (value == null)return false;
-
- return value.booleanValue();
- }
-
- /**
- * Once all of the fields have been updated on this ValidationConfiguration instance, this
- * preference should be stored back on the IResource for later use. This method must be called
- * manually by the validation framework once the fields of this type have been updated.
- */
- public final void passivate() throws InvocationTargetException {
- try {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLSAVE));
- }
- getResource().setSessionProperty(ConfigurationConstants.USER_PREFERENCE, this);
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SAVE, new String[]{getResource().getName()}));
- }
- }
-
- /**
- * Reset the values to the default values.
- */
- public abstract void resetToDefault() throws InvocationTargetException;
-
- protected Boolean convertToBoolean(boolean value) {
- return (value == true ? Boolean.TRUE : Boolean.FALSE);
- }
-
- protected Integer convertToInteger(int value) {
- return new Integer(value);
- }
-
- protected boolean convertToBoolean(String value) {
- Boolean b = Boolean.valueOf(value);
- return b.booleanValue();
- }
-
- protected int convertToInt(String value) {
- Integer t = Integer.valueOf(value);
- return t.intValue();
- }
-
- public static ValidatorMetaData[] convertToArray(Collection<ValidatorMetaData> c) {
- int length = (c == null) ? 0 : c.size();
- ValidatorMetaData[] result = new ValidatorMetaData[length];
- if (length == 0)return result;
-
- int count = 0;
- for (ValidatorMetaData vmd : c)result[count++] = vmd;
-
- return result;
- }
-
- public static ValidatorMetaData[] convertToArray(Object[] c) {
- int length = (c == null) ? 0 : c.length;
- ValidatorMetaData[] result = new ValidatorMetaData[length];
- if (length == 0)return result;
-
- System.arraycopy(c, 0, result, 0, length);
- return result;
- }
-
- /**
- * Save the values of these fields before the project or workspace is closed.
- */
- public void store() throws InvocationTargetException {
- store(null);
- }
-
- /**
- * Save the values of these fields before the project or workspace is closed.
- */
- public void store(Boolean persist) throws InvocationTargetException {
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, persist);
- pref.put(ValidationConfiguration.UserPreference, serialize());
- pref.put(ValidationConfiguration.UserManualPreference, serializeManualSetting());
- pref.put(ValidationConfiguration.UserBuildPreference, serializeBuildSetting());
- pref.put(ValidationConfiguration.DelegatesPreference, serializeDelegatesSetting());
- try {
- pref.flush();
- }
- catch (BackingStoreException e){
- throw new InvocationTargetException(e);
- }
- }
-
- /**
- * Load and store the version number, but nothing else. The version isn't a preference, but it's
- * stored and loaded as if it is. Because the load mechanism is different between an IProject
- * and the IWorkspaceRoot, keep the load mechanism inside the ValidationConfiguration
- * implementation, but initialize only the minimum at first. After the project has been
- * migrated, load the other fields (loading the other fields before the migration may overwrite
- * the values of those fields).
- */
- protected final void loadVersion() throws InvocationTargetException {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
- }
-
- IMarker[] marker = getMarker();
- String version = null;
- if (marker == null) {
- // either a new workspace or already migrated; proceed as normal
- version = loadVersion(getResource());
- } else {
- // migrate
- version = loadVersion(marker);
- }
- setVersion(version);
- }
-
- protected final String loadVersion(IMarker[] marker) throws InvocationTargetException {
- String version = (String) getValue(marker[0], ConfigurationConstants.VERSION);
- if (version == null) return ConfigurationConstants.VERSION4_03;
-
- return version;
- }
-
- protected final String loadVersion(IResource resource) throws InvocationTargetException {
- try {
- // This method will be called in one of two situations:
- // 1. This is a new workspace and no preferences exist.
- // 2. This is a migrated workspace and the old preferences have already been created as
- // persistent properties.
- String storedConfiguration = resource.getPersistentProperty(ConfigurationConstants.USER_PREFERENCE);
- String version = null;
- if (storedConfiguration == null) {
- version = getVersionDefault();
- } else {
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if (versionIndex != -1)
- version = storedConfiguration.substring(versionIndex + ConfigurationConstants.VERSION.length());
- }
-
- if (version == null) {
- return getVersionDefault();
- }
-
- return version;
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{getResource().getName()}));
- }
- }
-
- /**
- * Load the values of these fields when the project or workspace is opened.
- */
- protected final void load() throws InvocationTargetException {
- try {
- if (getResource() == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
- }
-
- IMarker[] marker = getMarker();
- if (marker == null) {
- // either a new workspace or already migrated; proceed as normal
- loadPreference();
- } else {
- // migrate
- load(marker);
- }
- } catch (InvocationTargetException exc) {
- throw exc;
- } catch (Exception exc) {
- String resourceName = (getResource() == null) ? "null" : getResource().getName(); //$NON-NLS-1$
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{resourceName}));
- }
- }
-
- /**
- * Return the IMarker that used to store the preference information, if the marker exists. (If
- * it doesn't exist, then it's already been migrated.)
- */
- protected abstract IMarker[] getMarker();
-
- protected abstract void load(IMarker[] marker) throws InvocationTargetException;
-
- protected Object getValue(IMarker marker, String attribName) {
- if (marker == null)return null;
-
- try {
- return marker.getAttribute(attribName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- protected boolean getValue(IMarker marker, String attribName, boolean defaultValue) {
- Boolean bool = (Boolean) getValue(marker, attribName);
- if (bool == null)return defaultValue;
-
- return bool.booleanValue();
- }
-
- protected int getValue(IMarker marker, String attribName, int defaultValue) {
- Integer integer = (Integer) getValue(marker, attribName);
- if (integer == null)return defaultValue;
-
- return integer.intValue();
- }
-
- protected String getValue(IMarker marker, String attribName, String defaultValue) {
- String string = (String) getValue(marker, attribName);
- if (string == null)return defaultValue;
-
- return string;
- }
-
- protected void loadPreference() throws InvocationTargetException {
- // This method will be called in one of two situations:
- // 1. This is a new workspace and no preferences exist.
- // 2. This is a migrated workspace and the old preferences have already been created as
- // persistent properties.
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
- deserializeAllPrefs(prefs);
- }
-
- /**
- * @param prefs
- * @throws InvocationTargetException
- */
- private void deserializeAllPrefs(PreferencesWrapper prefs) throws InvocationTargetException {
- String storedConfig = prefs.get(ValidationConfiguration.UserPreference, null);
- deserialize(storedConfig);
- String storedManualConfig = prefs.get(ValidationConfiguration.UserManualPreference, null);
- deserializeManual(storedManualConfig);
- String storedBuildConfig = prefs.get(ValidationConfiguration.UserBuildPreference, null);
- deserializeBuild(storedBuildConfig);
- String storedDelegatesConfiguration = prefs.get(ValidationConfiguration.DelegatesPreference, null);
- deserializeDelegates(storedDelegatesConfiguration);
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- Preferences prefs = (Preferences) event.getSource();
- if (prefs != null && !event.getOldValue().equals(event.getNewValue())) {
- try {
- deserializeAllPrefs(event);
- passivate();
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- private void deserializeAllPrefs(PropertyChangeEvent event) throws InvocationTargetException {
- String storedConfig = (String)event.getNewValue();
- if( event.getProperty().equals(ValidationConfiguration.UserPreference) ){
- deserialize(storedConfig);
- }else if(event.getProperty().equals(ValidationConfiguration.UserManualPreference)){
- deserializeManual(storedConfig);
- }else if(event.getProperty().equals(ValidationConfiguration.UserBuildPreference)){
- deserializeBuild(storedConfig);
- }else if(event.getProperty().equals(ValidationConfiguration.DelegatesPreference)){
- deserializeDelegates(storedConfig);
- }
- }
-
-
- protected void deserializeBuild(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int buildValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
-
- String manualValidation = storedConfiguration.substring(buildValidationIndex + ConfigurationConstants.ENABLED_BUILD_VALIDATORS.length(),storedConfiguration.length());
- setEnabledBuildValidators(getStringAsEnabledElementsArray(manualValidation));
- }
-
- protected void deserializeManual(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int manualValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
-
- String manualValidation = storedConfiguration.substring(manualValidationIndex + ConfigurationConstants.ENABLED_MANUAL_VALIDATORS.length(),storedConfiguration.length());
- setEnabledManualValidators(getStringAsEnabledElementsArray(manualValidation));
- }
-
- protected void deserializeDelegates(String storedConfiguration) throws InvocationTargetException {
-
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
-
- int delegatesIndex = storedConfiguration.indexOf(ConfigurationConstants.DELEGATE_VALIDATORS);
-
- String delegates = storedConfiguration.substring(delegatesIndex + ConfigurationConstants.DELEGATE_VALIDATORS.length(),storedConfiguration.length());
-
- if (delegates == null) {
- return;
- }
-
- StringTokenizer tokenizer = new StringTokenizer(delegates, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens()) {
- String delegateConfiguration = tokenizer.nextToken();
- int separatorIndex = delegateConfiguration.indexOf(ConfigurationConstants.DELEGATES_SEPARATOR);
- String targetID = delegateConfiguration.substring(0, separatorIndex);
- String delegateID = delegateConfiguration.substring(separatorIndex + 1);
- _delegatesByTarget.put(targetID, delegateID);
- }
- }
-
- protected void copyTo(ValidationConfiguration up) throws InvocationTargetException {
- up.setVersion(getVersion());
- up.setValidators(getValidators());
- up.setDisableAllValidation(isDisableAllValidation());
- up.setEnabledValidators(getEnabledValidators());
- up.setEnabledManualValidators(getManualEnabledValidators());
- up.setEnabledBuildValidators(getBuildEnabledValidators());
- up.setDelegatingValidators(getDelegatingValidators());
- }
-
- /**
- * The key is the id of the place holder validator, and the value is the id of validator
- * that will perform the validation.
- */
- public Map<String, String> getDelegatingValidators() throws InvocationTargetException {
- return _delegatesByTarget;
- }
-
- public void setDelegatingValidators(Map<String, String> source)
- {
- // It is safe to copy this map as it contains only immutable strings.
- _delegatesByTarget.putAll(source);
- }
-
- /**
- * Return true if the enabled validators have not changed since this ValidationConfiguration was
- * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
- * if the list of validators hasn't changed, then there is no need to update the task list;
- * updating the task list is a costly operation.)
- */
- protected boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd) throws InvocationTargetException {
- // First check the obvious: is every enabled validator still enabled, and is
- // the number of enabled validators the same as it was before? If not, return true.
- if (oldEnabledVmd == null) {
- // Something's gone wrong...
- return true;
- }
-
- for (int i = 0; i < oldEnabledVmd.length; i++) {
- ValidatorMetaData vmd = oldEnabledVmd[i];
- if (!isEnabled(vmd)) {
- return true;
- }
- }
-
- // Everything that was enabled is still enabled; have any additional
- // validators been enabled?
- if (numberOfEnabledValidators() != oldEnabledVmd.length) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Determines if there has been a change in the list of delegate validators.
- * @param oldDelegates a Map with the old delegates ID by target ID.
- * @return true if there has been a change, false otherwise.
- * @throws InvocationTargetException
- */
- protected boolean haveDelegatesChanged(Map<String, String> oldDelegates) throws InvocationTargetException {
-
- if (oldDelegates == null)return true;
-
- for (String targetID : oldDelegates.keySet()) {
- String oldDelegateID = oldDelegates.get(targetID);
- String newDelegateID = _delegatesByTarget.get(targetID);
-
- if (oldDelegateID == null || newDelegateID == null)return true;
-
- if (!newDelegateID.equals(oldDelegateID))return true;
- }
-
- if (oldDelegates.size() != _delegatesByTarget.size())return true;
-
- return false;
- }
-
- protected String serialize() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- buffer.append(String.valueOf(isDisableAllValidation()));
- buffer.append(ConfigurationConstants.VERSION);
- buffer.append(getVersion());
- return buffer.toString();
- }
-
- protected String serializeManualSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
- buffer.append(getEnabledElementsAsString(getManualEnabledValidators()));
- return buffer.toString();
- }
-
- protected String serializeBuildSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
- buffer.append(getEnabledElementsAsString(getBuildEnabledValidators()));
- return buffer.toString();
- }
-
- protected String serializeDelegatesSetting() throws InvocationTargetException {
- StringBuffer buffer = new StringBuffer();
- buffer.append(ConfigurationConstants.DELEGATE_VALIDATORS);
- buffer.append(getDelegatesAsString(getValidatorMetaData()));
- return buffer.toString();
- }
-
- /**
- * Provides a String which contains pairs of targetID=delegateID separated by a semicolon.
- * @param validatorMetaData a Map with the currently configured validators.
- * @return a String.
- */
- private String getDelegatesAsString(Map<ValidatorMetaData, Boolean> validatorMetaData) {
-
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : validatorMetaData.keySet()) {
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = getDelegateUniqueName(vmd);
-
- if (delegateID == null)continue;
-
- // Write out pairs targetID=delegateID
-
- buffer.append(targetID);
- buffer.append(ConfigurationConstants.DELEGATES_SEPARATOR);
- buffer.append(delegateID);
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
-
- return buffer.toString();
- }
-
- /**
- * Provides the delegate's ID of the validator delegate configured in this configuration for
- * a given delegating validator. That is answer the id of validator that is going to do the real work.
- *
- * @param vmd the delegating validator's meta data. Must not be null.
- * @return a String with the id of the validator delegate, null if there isn't one.
- */
- public String getDelegateUniqueName(ValidatorMetaData vmd) {
- String targetID = vmd.getValidatorUniqueName();
- return _delegatesByTarget.get(targetID);
- }
-
- /**
- * Provides the delegate's ID of the validator delegate configured in this configuration for
- * a given delegating validator. That is answer the id of validator that is going to do the real work.
- *
- * @param targetId the id of the target (or place holder) validator. Must not be null.
- * @return a String with the id of the validator delegate, null if there isn't one.
- */
- public String getDelegateForTarget(String targetId){
- return _delegatesByTarget.get(targetId);
- }
-
- /**
- * Sets the delegate's ID of the validator delegate to be used in this configuration for the
- * given delegating validator.
- *
- * @param vmd the delegating validator's metadata. Must not be null.
- * @param delegateID a String with the unique name (ID) of the validator delegate. Must not be null.
- */
- public void setDelegateUniqueName(ValidatorMetaData vmd, String delegateID) {
- String targetID = vmd.getValidatorUniqueName();
- _delegatesByTarget.put(targetID, delegateID);
- }
-
- /**
- * Deserialize everything except the version number; the version is deserialized first, in the
- * loadVersion() method.
- */
- protected void deserialize(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
- // Assume that the configuration has never been set (new workspace).
- resetToDefault();
- return;
- }
- int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
- int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
- if(disableAllValidationIndex != -1) {
- String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(),versionIndex);
- setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
- } else {
- setDisableAllValidation(false);
- }
-
- }
-
- public static boolean getDisableValidationDefault() {
- return ConfigurationConstants.DEFAULT_DISABLE_VALIDATION_SETTING;
- }
-
- public static ValidatorMetaData[] getEnabledValidatorsDefault() {
- return ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
- }
-
- public static int getMaximumNumberOfMessagesDefault() {
- return ConfigurationConstants.DEFAULT_MAXNUMMESSAGES;
- }
-
- public static String getVersionDefault() {
- // If the version can't be retrieved, assume that it's a new workspace. (A null version
- // could also mean a 4.03 workspace, but that's taken care of in the load(IMarker[])
- // method.)
- return ConfigurationConstants.CURRENT_VERSION;
- }
-
- public boolean isManualEnabled(ValidatorMetaData vmd) {
- if (vmd == null)return false;
- Boolean value = getManualEnabledValidatorsMap().get(vmd);
- if (value == null)return false;
- return value;
- }
-
- public boolean isBuildEnabled(ValidatorMetaData vmd) {
- if (vmd == null)return false;
- Boolean value = getBuildEnabledValidatorsMap().get(vmd);
- if (value == null)return false;
- return value;
- }
-
- public int numberOfManualEnabledValidators() throws InvocationTargetException {
- return getManualEnabledValidators().length;
- }
-
- public void enableSingleValidator(ValidatorMetaData vmd){
- getValidatorMetaData().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleValidator(ValidatorMetaData vmd){
- getValidatorMetaData().put(vmd, Boolean.FALSE);
- }
-
- public void enableSingleManualValidator(ValidatorMetaData vmd){
- getManualEnabledValidatorsMap().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleManualValidator(ValidatorMetaData vmd){
- getManualEnabledValidatorsMap().put(vmd, Boolean.FALSE);
- }
-
-
- public void enableSingleBuildValidator(ValidatorMetaData vmd){
- getBuildEnabledValidatorsMap().put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleBuildValidator(ValidatorMetaData vmd){
- getBuildEnabledValidatorsMap().put(vmd, Boolean.FALSE);
- }
-
- /**
- * Provides the delegate validator descriptor of the validator delegate configured
- * for the given delegating validator in the context of this configuration.
- * @param vmd the delegating validator's meta data. Must not be null.
- * @return a ValidatorDelegateDescriptor for the given delegating validator.
- */
- public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd) throws InvocationTargetException {
- String targetID = vmd.getValidatorUniqueName();
- String delegateID = getDelegateUniqueName(vmd);
-
- ValidatorDelegateDescriptor descriptor = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID);
- return descriptor;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
deleted file mode 100644
index 1ba2ed1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
+++ /dev/null
@@ -1,36 +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;
-
-import org.eclipse.wst.validation.internal.provisional.ValidationFactory;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-public class ValidationFactoryImpl implements ValidationFactory {
- static ValidationFactory inst = null;
-
- public ValidationFactoryImpl() {
- super();
- }
-
- public static ValidationFactory getInstance() {
- if(inst == null)
- inst = new ValidationFactoryImpl();
- return inst;
- }
-
-
-
- public IValidator getValidator(String validatorUniqueId) throws InstantiationException {
- ValidationRegistryReader reader = ValidationRegistryReader.getReader();
- return reader.getValidator(validatorUniqueId);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
deleted file mode 100644
index 9766048..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
+++ /dev/null
@@ -1,1353 +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.internal;
-
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-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.expressions.ExpressionTagNames;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.osgi.framework.Bundle;
-
-/**
- * ValidationRegistryReader is a singleton who reads the plugin registry for Validator extensions.
- * The read is done once (in the constructor), and the list of validators can be accessed by calling
- * "getValidatorMetaData(String)" on this class. The read is triggered by a call from
- * ValidatorManager's loadValidatorMetaData(IProject) method. ValidatorManager delegates the load
- * call to this class, and if this class is null, the singleton is new'ed up, and the registry is
- * read.
- * <p>
- * No Validator should need to know about this class. The only class which should call
- * ValidationRegistryReader is ValidatorManager.
- * </p>
- * <p>
- * The Validator itself is initialized in the "initializeValidator" method.
- * </p>
- */
-public final class ValidationRegistryReader implements RegistryConstants {
-
- /* <extension point="org.eclipse.wst.validation.internal.provisional.core.core.validator" id="EJBValidator" name="EJB
- * Validator"> <validator><projectNature id="com.ibm.etools.j2ee.EJBNature" include="false"/>
- * <filter objectClass="org.eclipse.core.resources.IFile" nameFilter = "ejb-jar.xml"/> <filter
- * objectClass="org.eclipse.core.resources.IFile" nameFilter = "*.java"/> <helper
- * class="org.eclipse.wst.validation.internal.provisional.core.core.ejb.workbenchimpl.EJBHelper"/> <run
- * class="org.eclipse.wst.validation.internal.provisional.core.core.ejb.EJBValidator" incremental="false" enabled="false"
- * pass="fast,full" async="false"/> <aggregateValidator class="my.aggregate.ValidatorClass"/>
- * <migrate><validator from="old.class.name" to="new.class.name"/> </migrate> </validator>
- * </extension>
- */
-
- private static ValidationRegistryReader _inst = new ValidationRegistryReader();
-
- /** list of all validators registered, with their associated ValidatorMetaData, indexed by project nature id */
- private final Map<String,Set<ValidatorMetaData>> _validators;
-
- // list of all validators, indexed by validator class name,
- // with the validator's ValidatorMetaData as the value.
- // Needed by the WorkbenchReporter, because sometimes the
- // IValidator is not enough to remove all messages from the
- // task list.
- private final Map<String, ValidatorMetaData> _indexedValidators;
-
- private final Set<ValidatorMetaData> _defaultEnabledValidators;
-
- // Since IProject's contents are all instances of IResource, every type filter for a validator
- // must be an instance of IResource. This applies to both the rebuildCache pass and to the
- // validation pass.
- private static final String IRESOURCE = "org.eclipse.core.resources.IResource"; //$NON-NLS-1$
-
- private static final String UNKNOWN_PROJECT = "UNKNOWN"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which can run on a project type which hasn't been explicitly filtered in or out by any validator.
- private static final String EXCLUDED_PROJECT = "EXCLUDED"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which are excluded on certain projects.
-
- /** @deprecated this instance variable should not be public. */
- public HashMap<IProject, Set<ValidatorMetaData>> projectValidationMetaData = new HashMap<IProject, Set<ValidatorMetaData>>();
-
- /**
- * The registry is read once - when this class is instantiated.
- */
- private ValidationRegistryReader() {
-
- _validators = new HashMap<String,Set<ValidatorMetaData>>();
- _indexedValidators = new HashMap<String, ValidatorMetaData>();
- _defaultEnabledValidators = new HashSet<ValidatorMetaData>();
- try {
-
- // Read the registry and build a map of validators. The key into
- // the map is the IValidator instance and the value is the ValidatorMetaData
- // which describes the IValidator.
- readRegistry();
-
- // Once all of the validators have been read, the caches of the
- // validators need to be updated.
- buildCache();
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Traverse over the list of VMDs which have been added and create copies of it. The copies are
- * created to increase runtime performance.
- */
- private void buildCache() {
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- buildProjectNatureCache(vmd);
- buildDefaultEnabledCache(vmd);
- }
-
- // Now add the validators which are configured on all projects,
- // and all projects but X.
- addRemainder();
-
- // this temporary list isn't needed any more. All of the excluded
- // projects have been added to the project natures which they don't exclude.
- _validators.remove(EXCLUDED_PROJECT);
-
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-01: ", debug()); //$NON-NLS-1$
- }
- }
-
- /**
- * Build the cache of VMDs which is indexed by project nature ids. If the validator is
- * registered on all project types, the vmd's project nature filters will be null.
- */
- private void buildProjectNatureCache(ValidatorMetaData vmd) {
- // Build the cache with the identified project natures in validators'
- // extensions.
- ValidatorNameFilter[] projNatureIds = vmd.getProjectNatureFilters();
- String[] facetFilters = vmd.getFacetFilters();
- if (projNatureIds == null) {
- if (facetFilters == null && vmd.getEnablementExpresion() == null) {
- add(UNKNOWN_PROJECT, vmd);
- }
- } else {
- boolean noneIncluded = true; // assume that the validator does not include any project
- // natures
- for (int i = 0; i < projNatureIds.length; i++) {
- ValidatorNameFilter pn = projNatureIds[i];
- if (pn.isInclude()) {
- noneIncluded = false;
- add(pn.getNameFilter(), vmd);
- }
- }
-
- if (noneIncluded) {
- // add it to the list of EXCLUDED projects
- // (that is, a validator which excludes project natures but doesn't
- // explicitly include any. This type of validator runs on any unrecognized (UNKNOWN)
- // projects, but the rest of the cache needs to be built before this is added
- // to the UNKNOWN list. See addExcludedRemainder().
- add(EXCLUDED_PROJECT, vmd);
- }
- }
- }
- /**
- * Build the list of validators which are enabled by default.
- */
- private void buildDefaultEnabledCache(ValidatorMetaData vmd) {
- if (vmd == null)return;
-
- if (vmd.isEnabledByDefault())_defaultEnabledValidators.add(vmd);
- }
-
- /**
- * Add vmd to the list of validators, indexed by validator class name
- */
- private void add(ValidatorMetaData vmd) {
- if (vmd == null) {
- return;
- }
-
- _indexedValidators.put(vmd.getValidatorUniqueName(), vmd);
- }
-
- /*
- * Some validators can run on any type of project. In order to have a static list, add the "any
- * project" validators to each "project nature" validators' list. This avoids adding the "any
- * project" validators to the "project nature" validators at runtime, which results in
- * performance savings.
- *
- * Some validators run on any type of project but X, where X is an excluded project nature.
- * Those validators should also be added via this method.
- */
- private void addRemainder() {
- // First, add all "can-run-on-any-project-type" to every registered project nature type in
- // the cache.
- addAnyRemainder();
-
- // Then add the "can-run-on-any-project-type-but-X" to every non-X registered project nature
- // type in the cache.
- addExcludedRemainder();
- }
-
- private void addExcludedRemainder() {
- Set<ValidatorMetaData> excludedProjVmds = _validators.get(EXCLUDED_PROJECT);
- if (excludedProjVmds == null) {
- // no excluded project natures
- return;
- }
-
- for (ValidatorMetaData vmd : excludedProjVmds) {
-
- // assume that, by default, if someone explicitly excludes
- // a project nature then they don't include any project natures
- boolean noneIncluded = true;
-
- // a project nature then they don't include any project natures
- for (String projId : _validators.keySet()) {
- if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
- // Don't add list to a project nature which is excluded or applicable to all.
- continue;
- }
-
- ValidatorNameFilter filter = vmd.findProjectNature(projId);
- if (filter != null) {
- // Don't add list to itself (filter.isIncluded() == true) or
- // to a list from which it's excluded (filter.isIncluded() == false)
- if (filter.isInclude()) {
- noneIncluded = false;
- }
- continue;
- }
-
- add(projId, vmd);
- }
-
- if (noneIncluded) {
- // At this point, the "can-run-on-any-project" becomes
- // "not-excluded-on-these-projects". That is, if the project
- // nature id isn't in the list of _validators, then it isn't
- // included or excluded by any validators, so all validators
- // which can run on any project AND all validators which can
- // run on any but certain excluded projects can run on the
- // given IProject.
- add(UNKNOWN_PROJECT, vmd);
- }
- }
- }
-
- private void addAnyRemainder() {
- Set<ValidatorMetaData> anyProjVmds = _validators.get(UNKNOWN_PROJECT);
- if (anyProjVmds == null) {
- // no validators run on all projects
- return;
- }
-
- for (String projId : _validators.keySet()) {
- if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
- // Don't add list to itself or to a project nature which is excluded.
- continue;
- }
-
- add(projId, anyProjVmds);
- }
- }
-
- private void add(String projectNatureId, Set<ValidatorMetaData> vmdList) {
- if ((vmdList == null) || (vmdList.size() == 0))return;
-
- // whether the validator includes or excludes this
- // project nature id, make sure that an entry is created for it in the table
- Set<ValidatorMetaData> pnVal = createSet(projectNatureId);
- pnVal.addAll(vmdList);
- _validators.put(projectNatureId, pnVal);
- }
-
- private void add(String projectNatureId, ValidatorMetaData vmd) {
- if (vmd == null)return;
-
- // whether the validator includes or excludes this
- // project nature id, make sure that an entry is created for it in the table
- Set<ValidatorMetaData> pnVal = createSet(projectNatureId);
- pnVal.add(vmd);
- _validators.put(projectNatureId, pnVal);
- }
-
- /**
- * When a validator's class or helper class cannot be loaded, the vmd calls this method to
- * disable the validator. The validator will be removed from the preference page, properties
- * page, and enabled list of any project thereafter validated.
- */
- public void disableValidator(ValidatorMetaData vmd) {
- _indexedValidators.remove(vmd.getValidatorUniqueName());
- _defaultEnabledValidators.remove(vmd);
-
- // The whole "on-any-project" and "exclude-this-project-nature" would take
- // a lot of processing time... Instead, traverse the list of proj nature ids,
- // and search the Set of that proj nature id, and remove the vmd if it's in the
- // Set.
- for (String projId : _validators.keySet()) {
- Set<ValidatorMetaData> value = _validators.get(projId);
- if (value == null)continue;
-
- if (value.contains(vmd)) {
- value.remove(vmd);
- _validators.put(projId, value);
- }
- }
- }
-
- private Set<ValidatorMetaData> createSet(String projNature) {
- Set<ValidatorMetaData> v = _validators.get(projNature);
- if (v == null) {
- v = new HashSet<ValidatorMetaData>();
- }
- return v;
- }
-
- /**
- * Given an IConfigurationElement, if it has a project nature(s) specified, return the
- * ValidatorNameFilters which represent those natures. Otherwise return null.
- *
- * A project nature can be specified in plugin.xml to indicate what types of IProjects a
- * validator can run on.
- */
- private String[] getAggregateValidatorsNames(IConfigurationElement element) {
- IConfigurationElement[] filters = element.getChildren(TAG_AGGREGATE_VALIDATORS);
- if (filters.length == 0)
- return null;
-
- String[] names = new String[filters.length];
- for (int i = 0; i < names.length; i++) {
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- String nameFilter = filters[i].getAttribute(ATT_CLASS);
- if (nameFilter != null) {
- nameFilter = nameFilter.intern();
- }
- names[i] = nameFilter;
- }
- return names;
- }
-
- private String[] getContentTypeBindings(IConfigurationElement element){
- IConfigurationElement[] bindings = element.getChildren(TAG_CONTENTTYPE);
- if(bindings.length == 0)
- return null;
- String[] cTypeIDs = new String[bindings.length];
- for (int i = 0; i < bindings.length; i ++){
-
- cTypeIDs[i] = bindings[i].getAttribute(ATT_CONTENTTYPEID);
- }
-
- return cTypeIDs;
-
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, if it has any filter tags, construct the
- * appropriate ValidatorFilters to represent those tags; else return null.
- *
- * A filter can be specified in plugin.xml to filter out certain resources.
- */
- private ValidatorFilter[] getFilters(IConfigurationElement element) {
- IConfigurationElement[] filters = element.getChildren(TAG_FILTER);
- if (filters.length == 0)
- return null;
-
- ValidatorFilter[] vf = new ValidatorFilter[filters.length];
- for (int i = 0; i < filters.length; i++) {
- vf[i] = new ValidatorFilter(IRESOURCE);
-
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- String nameFilter = filters[i].getAttribute(ATT_NAME_FILTER);
- if (nameFilter != null) {
- nameFilter = nameFilter.intern();
- }
- String isCaseSensitive = filters[i].getAttribute(ATT_CASE_SENSITIVE);
- vf[i].setNameFilter(nameFilter, isCaseSensitive);
-
- String objectClass = filters[i].getAttribute(ATT_OBJECT_CLASS);
- if (objectClass != null) {
- objectClass = objectClass.intern();
- }
- vf[i].setTypeFilter(objectClass);
-
- String actionFilter = filters[i].getAttribute(ATT_ACTION_FILTER);
- if (actionFilter != null) {
- actionFilter = actionFilter.intern();
- }
- vf[i].setActionFilter(actionFilter);
- }
- return vf;
- }
-
- public boolean getDependentValidatorValue(IConfigurationElement element) {
- IConfigurationElement[] depValidatorElement = element.getChildren(DEP_VALIDATOR);
- if (depValidatorElement.length == 0)
- return false;
- String depValue = depValidatorElement[0].getAttribute(DEP_VAL_VALUE);
- boolean depBoolValue = (new Boolean(depValue)).booleanValue();
- return depBoolValue;
- }
-
- /**
- * Return the name of the marker ID associated with the IValidator.
- */
- public String[] getMarkerIdsValue(IConfigurationElement element) {
- IConfigurationElement[] markerId = element.getChildren(MARKER_ID);
- if (markerId.length == 0)
- return null;
- String markerIds[] = new String[markerId.length];
- for(int i = 0; i < markerIds.length; i++) {
- markerIds[i] = markerId[i].getAttribute(MARKER_ID_VALUE);
- }
- return markerIds;
- }
-
- public String[] getFacetIds(IConfigurationElement element) {
- IConfigurationElement[] facets = element.getChildren(FACET);
- if (facets.length == 0)
- return null;
- String[] facetIds = new String[facets.length];
- for (int i = 0; i < facets.length; i++) {
- facetIds[i] = facets[i].getAttribute(FACET_ID);
- }
- return facetIds;
- }
-
- /**
- * Return the name of the helper class associated with the IValidator.
- */
- private String getHelperName(IConfigurationElement element) {
- IConfigurationElement[] helpers = element.getChildren(TAG_HELPER_CLASS);
- if (helpers.length == 0)
- return null;
-
- return helpers[0].getAttribute(ATT_CLASS);
- }
-
- static IWorkbenchContext createHelper(IConfigurationElement element, String helperClassName) {
- IWorkbenchContext wh = null;
- try {
- wh = (IWorkbenchContext) element.createExecutableExtension(TAG_HELPER_CLASS);
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- String result = MessageFormat.format(
- ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_HELPER_THROWABLE),
- new Object[]{helperClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
- return null;
- }
- return wh;
- }
-
- static IValidator createValidator(IConfigurationElement element, String validatorClassName) {
- IValidator validator = null;
- try {
- validator = (IValidator) element.createExecutableExtension(ATT_CLASS);
- } catch (Exception e) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_THROWABLE),
- new Object[]{validatorClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- if (validator == null) {
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-02: ", //$NON-NLS-1$
- NLS.bind(ValMessages.VbfExcSyntaxNoValNull, validatorClassName));
- }
- return null;
- }
-
- return validator;
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator is
- * enabled by default.
- *
- * If no enabled attribute is specified, the default, true (i.e., enabled) is returned.
- */
- private boolean getEnabledByDefault(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String inc = runChildren[0].getAttribute(ATT_ENABLED);
- if (inc == null) {
- return RegistryConstants.ATT_ENABLED_DEFAULT;
- }
-
- return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * incremental validation.
- *
- * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
- * is returned.
- */
- private boolean getIncremental(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String inc = runChildren[0].getAttribute(ATT_INCREMENTAL);
- if (inc == null) {
- return RegistryConstants.ATT_INCREMENTAL_DEFAULT;
- }
-
- return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * full build validation.
- *
- * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
- * is returned.
- */
- private boolean getFullBuild(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String fb = runChildren[0].getAttribute(ATT_FULLBUILD);
- if (fb == null) {
- return RegistryConstants.ATT_FULLBUILD_DEFAULT;
- }
-
- return Boolean.valueOf(fb.trim().toLowerCase()).booleanValue(); // this will return true if,
- // and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be considered
- // "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
- * asynchronous validation.
- *
- * If no async attribute is specified, the default, true (i.e., the validator is thread-safe) is
- * returned.
- */
- private boolean getAsync(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String async = runChildren[0].getAttribute(ATT_ASYNC);
- if (async == null) {
- return RegistryConstants.ATT_ASYNC_DEFAULT;
- }
-
- return Boolean.valueOf(async.trim().toLowerCase()).booleanValue(); // this will return true
- // if, and only if, the
- // attribute value is
- // "true". For example,
- // "yes" will be
- // considered "false".
- }
-
- /**
- * Given an IConfigurationElement from plugin.xml, return the types of validation passes, as
- * defined in IRuleGroup, that the validator performs.
- *
- * If no pass attribute is specified, the default, IRuleGroup.PASS_FULL, is returned.
- */
- private int getRuleGroup(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- // Don't need to check if runChildren is null or empty, because that was checked in the
- // initializeValidator method.
-
- String pass = runChildren[0].getAttribute(ATT_RULE_GROUP);
- if (pass == null) {
- return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- }
-
- final String COMMA = ","; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(pass, COMMA, false); // false means don't
- // return the comma as
- // part of the string
- int result = 0; // no passes identified
- while (tokenizer.hasMoreTokens()) {
- String nextAction = tokenizer.nextToken().trim();
- if (nextAction.equals(IRuleGroup.PASS_FAST_NAME)) {
- result = result | IRuleGroup.PASS_FAST;
- } else if (nextAction.equals(IRuleGroup.PASS_FULL_NAME)) {
- result = result | IRuleGroup.PASS_FULL;
- }
- }
-
- if (result == 0) {
- // No recognized passes. Return the default.
- return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- }
-
- return result;
- }
-
- private ValidatorMetaData.MigrationMetaData getMigrationMetaData(IConfigurationElement element) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_MIGRATE);
- if ((runChildren == null) || (runChildren.length == 0)) {
- return null;
- }
-
- // Only supposed to be one "migrate" section in a validator, so ignore the rest
- IConfigurationElement migrate = runChildren[0];
-
- // Now look for the "validator" elements. Zero or more can be specified.
- IConfigurationElement[] migrateChildren = migrate.getChildren(TAG_VALIDATOR);
- if ((migrateChildren == null) || (migrateChildren.length == 0)) {
- return null;
- }
-
- ValidatorMetaData.MigrationMetaData mmd = new ValidatorMetaData.MigrationMetaData();
- for (int i = 0; i < migrateChildren.length; i++) {
- IConfigurationElement migrateChild = migrateChildren[i];
- String from = migrateChild.getAttribute(ATT_FROM);
- if (from == null) {
- continue;
- }
-
- String to = migrateChild.getAttribute(ATT_TO);
- if (to == null) {
- continue;
- }
- mmd.addId(from, to);
- }
- return mmd;
- }
-
- /**
- * Given an IConfigurationElement, if it has a project nature(s) specified, return the
- * ValidatorNameFilters which represent those natures. Otherwise return null.
- *
- * A project nature can be specified in plugin.xml to indicate what types of IProjects a
- * validator can run on.
- */
- private ValidatorNameFilter[] getProjectNatureFilters(IConfigurationElement element) {
- IConfigurationElement[] filters = element.getChildren(TAG_PROJECT_NATURE);
- if (filters.length == 0) {
- return null;
- }
-
- ValidatorNameFilter[] vf = new ValidatorNameFilter[filters.length];
- for (int i = 0; i < filters.length; i++) {
- vf[i] = new ValidatorNameFilter();
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
- String nameFilter = filters[i].getAttribute(ATT_ID);
- if (nameFilter != null) {
- nameFilter = nameFilter.intern();
- }
- vf[i].setNameFilter(nameFilter);
-
- String include = filters[i].getAttribute(ATT_INCLUDE);
- vf[i].setInclude(include);
- }
- return vf;
- }
-
- /**
- * Returns the singleton ValidationRegistryReader.
- */
- public static ValidationRegistryReader getReader() {
- return _inst;
- }
-
- public static boolean isActivated() {
- // Whether the registry has been read or not is kept in the EventManager
- // class instead of this class in order to work around a shutdown problem.
- // See the comment in the isActive() method of the EventManager class
- // for details.
- return EventManager.getManager().isActive();
- }
-
- /**
- * Returns the Validator extension point
- */
- private IExtensionPoint getValidatorExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATOR_EXT_PT_ID);
- if (extensionPoint == null) {
- // If this happens it means that someone removed the "validator" extension point
- // declaration from our plugin.xml file.
- if (Tracing.isTraceV1()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MISSING_VALIDATOR_EP),
- new Object[]{ValidationPlugin.PLUGIN_ID + "." + VALIDATOR_EXT_PT_ID}); //$NON-NLS-1$
- Tracing.log("ValidationRegistryReader-03: ", result); //$NON-NLS-1$
- }
- }
- return extensionPoint;
- }
-
- /**
- * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
- * any code not in this package.
- */
- public ValidatorMetaData getValidatorMetaData(IValidator validator) {
- // retrieval will be in log(n) time
- if (validator == null) {
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{"null"}); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- return null;
- }
-
- String validatorClassName = validator.getClass().getName();
- ValidatorMetaData vmd = getValidatorMetaData(validatorClassName);
- if (vmd != null) {
- return vmd;
- }
-
- // If we got here, then vmd is neither a root nor an aggregate validator,
- // yet the IValidator exists. Internal error.
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{validatorClassName});
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- return null;
- }
-
- public Set<ValidatorMetaData> getValidatorMetaData(IWorkspaceRoot root) {
- // Every validator on the Preferences page must be returned
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- clone(_indexedValidators.values(), copy);
- return copy;
- }
-
- /**
- * Return a collection of Validators configured on a certain type of IProject (e.g. EJB Project
- * vs. Web Project).
- *
- * This is a long-running process. If you can, cache the result.
- */
- public Set<ValidatorMetaData> getValidatorMetaData(IProject project) {
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- getValidatorMetaData(project, copy);
- return copy;
- }
-
- /**
- * Copy the set of configured validator metadata into the Set.
- */
- public void getValidatorMetaData(IProject project, Set<ValidatorMetaData> vmds) {
- if (vmds == null)return;
- vmds.clear();
- int executionMap = 0x0;
- try {
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-04: IProject is " + String.valueOf(project)); //$NON-NLS-1$
- }
- if (project == null) {
- executionMap |= 0x1;
- // vmds is already clear
- return;
- }
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException e) {
- executionMap |= 0x2;
- // vmds is already clear
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- // If there are no project natures on a particular project,
- // or if this project nature has no validators configured
- // on it, return the validators which are configured on all
- // projects.
- if ((projectNatures == null) || (projectNatures.length == 0)) {
- executionMap |= 0x4;
-
- // Also include the validators which are enabled through enablement
- // expression for this project.
- // Note that the API isFacetEnabled(vmd, project) works properly
- // only when the plugin containing the property tester is activated.
- // forcePluginActivation="true" may be needed in the declaration of
- // the enablement in the validator extension point.
- // <enablement>
- // <test forcePluginActivation="true" property="foo.testProperty"/>
- // </enablement>
-
- Set<ValidatorMetaData> validatorsWithEnablementExpression = new HashSet<ValidatorMetaData>();
- for (ValidatorMetaData vmd : getAllValidators()) {
- if (isFacetEnabled(vmd, project)) {
- validatorsWithEnablementExpression.add(vmd);
- }
- }
- if(validatorsWithEnablementExpression.size() > 0 ){
- validatorsWithEnablementExpression.addAll( getValidatorMetaDataUnknownProject());
- clone(validatorsWithEnablementExpression, vmds);
- }
- else
- clone(getValidatorMetaDataUnknownProject(), vmds);
-
-
- } else {
- executionMap |= 0x8;
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-05: ", projectNatures.toString()); //$NON-NLS-1$
- }
- calculateVmdsForNatureAndFacets(vmds, projectNatures,project);
- // Now filter out the validators which must not run on this project
- removeExcludedProjects(project, vmds);
- if (vmds.size() == 0) {
- executionMap |= 0x20;
- clone(getValidatorMetaDataUnknownProject(), vmds);
- }
- }
- } finally {
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer();
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log("ValidationRegistryReader-06: ", buffer.toString()); //$NON-NLS-1$
- }
- }
- }
-
- /**
- * @param project
- * @param vmds
- * @param projectNatures
- */
- private void calculateVmdsForNatureAndFacets(Set<ValidatorMetaData> vmds, String[] projectNatures, IProject project) {
- Set<ValidatorMetaData> projVmds;
- String[] projectFacetIds = getProjectFacetIds(project);
- for (ValidatorMetaData vmd : getAllValidators()) {
- if (containsProjectFacet(vmd, projectFacetIds) || isFacetEnabled(vmd, project)) {
- vmds.add(vmd);
- }
- }
- for (String projectNatureId : projectNatures) {
- projVmds = _validators.get(projectNatureId);
- if (projVmds == null)continue;
-
- for (ValidatorMetaData vmd : projVmds) {
- if (!vmds.contains(vmd) && (vmd.getFacetFilters() == null || vmd.getFacetFilters().length == 0)) {
- if (vmd.getEnablementExpresion() == null)vmds.add(vmd);
- else if (isFacetEnabled(vmd, project))vmds.add(vmd);
- }
- }
- }
- }
-
- private boolean containsProjectFacet(ValidatorMetaData vmd, String[] projectFacetIds) {
- String[] validatorFacets = vmd.getFacetFilters();
- if (validatorFacets != null && validatorFacets.length > 0) {
- if (projectFacetIds != null && projectFacetIds.length > 0) {
- if (Arrays.asList(projectFacetIds).containsAll(Arrays.asList(validatorFacets)))
- return true;
- }
- }
- return false;
- }
-
- private boolean isFacetEnabled(ValidatorMetaData vmd, IProject project) {
- try {
- Expression expression = vmd.getEnablementExpresion();
- if (expression != null) {
- EvaluationContext context = new EvaluationContext(null, project);
- context.setAllowPluginActivation(true);
- EvaluationResult result = expression.evaluate(context);
- return result == EvaluationResult.TRUE;
- }
- } catch (CoreException ce) {
- }
- return false;
- }
-
- private String[] getProjectFacetIds(IProject project) {
- try {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null) {
- Object[] projectFacets = fProject.getProjectFacets().toArray();
- String[] projectFacetIds = new String[projectFacets.length];
- for (int i = 0; i < projectFacets.length; i++) {
- IProjectFacet projectFacet = ((IProjectFacetVersion) projectFacets[i]).getProjectFacet();
- projectFacetIds[i] = projectFacet.getId();
- }
- return projectFacetIds;
- }
- } catch (CoreException ce) {
- }
-
- return null;
- }
-
- /*
- * If one project nature on the project includes a particular validator, but another project
- * nature excludes that validator, then the validator needs to be removed from the vmd set.
- *
- * For example, if AValidator can run on any java project but not on a J2EE project, which is an
- * instance of a java project, then the AValidator is included by the java nature and excluded
- * by the J2EE nature. The AValidator would have to be removed from the set.
- */
- private void removeExcludedProjects(IProject project, Set<ValidatorMetaData> vmds) {
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-12: before:\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log(buffer);
- }
-
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- if ((projectNatures == null) || (projectNatures.length == 0)) {
- // nothing needs to be removed from the list
- return;
- }
- for (int i = 0; i < projectNatures.length; i++) {
- String nature = projectNatures[i];
- Iterator<ValidatorMetaData> iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = iterator.next();
- ValidatorNameFilter[] natureFilters = vmd.getProjectNatureFilters();
- if (natureFilters == null) {
- // Can run on any project
- continue;
- }
-
- for (ValidatorNameFilter pn : natureFilters) {
- if (nature.equals(pn.getNameFilter()) && !pn.isInclude()) {
- iterator.remove();
- break;
- }
- }
- }
- }
-
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-13: after:\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : vmds) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- Tracing.log(buffer);
- }
- }
-
- @SuppressWarnings("unchecked")
- private Collection clone(Collection input, Collection copy) {
- if (input == null || copy == null)return null;
- copy.clear();
- copy.addAll(input);
- return copy;
- }
-
- public String debug() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("Project nature => validators configured"); //$NON-NLS-1$
- buffer.append("\n"); //$NON-NLS-1$
- for (String projId : _validators.keySet()) {
- buffer.append("projId: "); //$NON-NLS-1$
- buffer.append(projId);
- buffer.append("\n"); //$NON-NLS-1$
- Set<ValidatorMetaData> validators = _validators.get(projId);
- for (ValidatorMetaData vmd : validators) {
- buffer.append("\t"); //$NON-NLS-1$
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- }
- buffer.append("\n"); //$NON-NLS-1$
-
- buffer.append("Enable/disable validator by default"); //$NON-NLS-1$
- buffer.append("\n"); //$NON-NLS-1$
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append(" enabled? "); //$NON-NLS-1$
- buffer.append(vmd.isEnabledByDefault());
- buffer.append("\n"); //$NON-NLS-1$
- }
-
- return buffer.toString();
- }
-
- public boolean isConfiguredOnProject(ValidatorMetaData vmd, IProject project) {
- Set<ValidatorMetaData> vmds = null;
- synchronized(projectValidationMetaData){
- vmds = projectValidationMetaData.get(project);
- }
- if (vmds != null) {
- return vmds.contains(vmd);
- } else {
- Set<ValidatorMetaData> prjVmds = getValidatorMetaData(project);
- if (prjVmds == null || prjVmds.size() == 0)return false;
- synchronized(projectValidationMetaData){
- projectValidationMetaData.put(project, prjVmds);
- }
- return prjVmds.contains(vmd);
- }
- }
-
- public void clearCachedMaps(){
- synchronized(projectValidationMetaData){
- projectValidationMetaData.clear();
- }
- }
-
- /**
- * Return a set of ValidatorMetaData which are configured on all projects or which run on any
- * projects except certain project types.
- *
- * Unlike other get methods, because this method is private it doesn't return a clone.
- *
- * @see addExcludedRemainder()
- */
- private Set<ValidatorMetaData> getValidatorMetaDataUnknownProject() {
- Set<ValidatorMetaData> projVmds = _validators.get(UNKNOWN_PROJECT);
- if (projVmds == null) {
- projVmds = new HashSet<ValidatorMetaData>();
- }
- return projVmds;
- }
-
- /**
- * Return a set of ValidatorMetaData which are enabled by default.
- */
- public Set<ValidatorMetaData> getValidatorMetaDataEnabledByDefault() {
- Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
- clone(_defaultEnabledValidators, copy);
- return copy;
- }
-
- public ValidatorMetaData[] getValidatorMetaDataArrayEnabledByDefault() {
- ValidatorMetaData[] result = new ValidatorMetaData[_defaultEnabledValidators.size()];
- _defaultEnabledValidators.toArray(result);
- return result;
- }
-
- /**
- * This method should be called ONLY by the validation framework, UI, or TVT plugin. In general,
- * only the validation framework and the validation TVT should handle ValidatorMetaData objects.
- *
- * Given a string which identifies a fully-qualified class name of a validator, return the
- * ValidatorMetaData that uses a validator of that name, if it exists.
- *
- * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
- * any code not in this package.
- */
- public ValidatorMetaData getValidatorMetaData(String validatorClassName) {
- if (validatorClassName == null)return null;
-
- ValidatorMetaData vmd2 = _indexedValidators.get(validatorClassName);
- if (vmd2 != null)return vmd2;
-
- // Check for an aggregate validator
- for (ValidatorMetaData vmd : _indexedValidators.values()) {
- if (vmd == null)continue;
-
- if (vmd.getValidatorUniqueName().equals(validatorClassName))return vmd;
-
- String[] aggregateNames = vmd.getAggregatedValidatorNames();
- if (aggregateNames != null) {
- for (String aggregateName : aggregateNames) {
- if (validatorClassName.equals(aggregateName))return vmd;
- }
- }
-
- // Current name of validator doesn't match; has this validator been
- // migrated from another package?
- ValidatorMetaData.MigrationMetaData mmd = vmd.getMigrationMetaData();
- if (mmd == null) {
- // Validator class name hasn't been migrated
- continue;
- }
-
- Set<String[]> idList = mmd.getIds();
- if (idList == null) {
- // Invalid <migrate> element.
- continue;
- }
-
- for (String[] ids : idList) {
- if (ids.length != 2) {
- // log
- continue;
- }
-
- String from = ids[0];
- if (from == null) {
- // log
- continue;
- }
-
- if (from.equals(validatorClassName)) {
- return vmd;
- }
- }
- }
-
- // If we got to this point, no validator using that class name is loaded.
- return null;
- }
-
- /**
- * Return true if the named validator is installed, otherwise false.
- */
- public boolean isExistingValidator(String validatorClassName) {
- return (getValidatorMetaData(validatorClassName) != null);
- }
-
- /**
- * Initialize the validator with the static metadata (runtime metadata is initialized in the
- * ValidationOperation class).
- */
- private ValidatorMetaData initializeValidator(IConfigurationElement element, String validatorName, String pluginId) {
- IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
- if ((runChildren == null) || (runChildren.length < 1)) {
- // How can an IValidatorImpl be created when there no class name to instantiate?
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-07: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorName)); //$NON-NLS-1$
- }
- return null;
- }
-
- //WTP Bugzilla defect: 82338
- //Using the Unique Identifier give the flexibility of the same validator class used by other validator extensions without writing a new validation class
- //Reverting the fix back as the class name defined in the ext is unique to this validator and has to be used for the unique id in the validation metadata
- String validatorImplName = runChildren[0].getAttribute(ATT_CLASS);
-
- if (validatorImplName == null) {
- // Same as before; how can we instantiate when...
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-08: ", NLS.bind(ValMessages.VbfExcSyntaxNoValClass, validatorName)); //$NON-NLS-1$
- }
- return null;
- }
-
- String helperImplName = getHelperName(element);
- if (helperImplName == null) {
- // Same as before; how can we instantiate when...
- if (Tracing.isLogging()) {
- Tracing.log("ValidationRegistryReader-09: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorImplName)); //$NON-NLS-1$
- }
- return null;
- }
-
- // In order to speed up our String comparisons, load these
- // names into Java's constants space. This way, we'll be able to
- // use pointer comparison instead of the traditional
- // character-by-character comparison. Since these names should
- // never be set by anyone other than this class, and this class
- // sets them only once, it is safe to declare these Strings
- // constants.
- //
- // To load a String into the constants space, call intern() on the String.
- //
-
- boolean async = getAsync(element);
- String[] markerIds = initializeValidatorCustomMarkers(element, pluginId);
- ValidatorMetaData vmd = new ValidatorMetaData(async, getAggregateValidatorsNames(element), getEnabledByDefault(element),
- getIncremental(element), getFullBuild(element), element, helperImplName, getMigrationMetaData(element),
- pluginId, getRuleGroup(element), runChildren[0], validatorName.intern(), validatorImplName.intern(),
- getContentTypeBindings(element), getDependentValidatorValue(element), getEnablementElement(element),
- getFacetIds(element), getFilters(element), getProjectNatureFilters(element), markerIds);
-
-
- if (Tracing.isTraceV1()) {
- Tracing.log("ValidationRegistryReader-10: validator loaded: " + validatorImplName); //$NON-NLS-1$
- }
-
- return vmd;
- }
-
- /**
- * @param element
- * @param pluginId
- * @param vmd
- */
- private String[] initializeValidatorCustomMarkers(IConfigurationElement element, String pluginId) {
- String[] qualifiedMarkerIds = null;
- String[] customMarkerIds = getMarkerIdsValue(element);
- if (customMarkerIds != null && customMarkerIds.length > 0) {
- qualifiedMarkerIds = new String[customMarkerIds.length];
- for (int i = 0; i < customMarkerIds.length; i++) {
- String markerid = customMarkerIds[i];
- if (markerid.lastIndexOf(".") != -1) { //$NON-NLS-1$
- String pluginID = markerid.substring(0, markerid.lastIndexOf(".")); //$NON-NLS-1$
- Bundle bundle = Platform.getBundle(pluginID);
- if (bundle == null)
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
- else
- qualifiedMarkerIds[i] = customMarkerIds[i];
- } else
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
- }
- }
- return qualifiedMarkerIds;
- }
-
- private Expression getEnablementElement(IConfigurationElement element) {
- IConfigurationElement[] enablements = element.getChildren(ExpressionTagNames.ENABLEMENT);
- if (enablements.length == 0)
- return null;
- try {
- return ExpressionConverter.getDefault().perform(enablements[0]);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return null;
- }
-
- /**
- * This method should be called ONLY BY THE VALIDATION FRAMEWORK! The value from this method is
- * used to populate the validation preference page.
- */
- public Collection<ValidatorMetaData> getAllValidators() {
- Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>(50);
- clone(_indexedValidators.values(), validators);
- return validators;
- }
-
- public int numberOfValidators() {
- return _indexedValidators.size();
- }
-
- /**
- * Reads one extension by looping through its configuration elements.
- */
- private void readExtension(IExtension extension) {
- IConfigurationElement[] elements = extension.getConfigurationElements();
-
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
-
- String label = extension.getLabel();
- if (label == null || label.equals("")) { //$NON-NLS-1$
- if (Tracing.isTraceV1()) {
- String[] msgParm = {extension.getUniqueIdentifier()};
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_VALIDATORNAME_IS_NULL),
- (Object[])msgParm);
- Tracing.log("ValidationRegistryReader-11: ", result); //$NON-NLS-1$
- }
- } else {
- // If getLabel() returns an empty string, this is an illegal validator.
- // The PropertyPage, and other status messages, need to have a displayable name for
- // the validator.
- String pluginId = extension.getContributor().getName();
- if (Tracing.isEnabled(extension.getUniqueIdentifier())){
- ValidatorMetaData vmd = initializeValidator(element, label, pluginId);
-
- if (vmd != null) {
- // Add this validator to the list of validators; if vmd is null, the validator
- // couldn't be created.
- add(vmd);
- }
- }
- }
- }
- }
-
- /**
- * Reads the registry to find the Validators which have been implemented.
- */
- private void readRegistry() {
- _validators.clear();
-
- // Get the extensions that have been registered.
- IExtensionPoint validatorEP = getValidatorExtensionPoint();
- if (validatorEP == null) {
- return;
- }
- IExtension[] extensions = validatorEP.getExtensions();
-
- // find all runtime implementations
- for (int i = 0; i < extensions.length; i++) {
- readExtension(extensions[i]);
- }
-
- // Force the delegate validators registry to be read early to avoid
- // the non-synchronized singleton issue which occurs when two delegating
- // validators race to load the registry.
-
- ValidatorDelegatesRegistry.getInstance();
- }
-
- public IValidator getValidator(String validatorClassName) throws InstantiationException {
- ValidatorMetaData vmd = _indexedValidators.get(validatorClassName);
- if(vmd != null)
- return vmd.getValidator();
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
deleted file mode 100644
index cf3ce9a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
+++ /dev/null
@@ -1,114 +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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class ValidationSelectionHandlerRegistryReader {
-
- public static final String VALIDATION_SELECTION_HANDLER = "validationSelectionHandler"; //$NON-NLS-1$
- static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** handlerClass - */
- static final String ATT_HANDLER_CLASS = "handlerClass"; //$NON-NLS-1$
-
- static final String ATT_SELECTION_TYPE = "selectionType"; //$NON-NLS-1$
- private static ValidationSelectionHandlerRegistryReader INSTANCE;
- private List<IValidationSelectionHandler> _validationSelectionHandlers;
-
- public ValidationSelectionHandlerRegistryReader() {
- }
-
- public static ValidationSelectionHandlerRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationSelectionHandlerRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_SELECTION_HANDLER);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VALIDATION_SELECTION_HANDLER))
- return false;
-
-// String handlerClass = element.getAttribute(ATT_HANDLER_CLASS);
- String selectionType = element.getAttribute(ATT_SELECTION_TYPE);
-
- IValidationSelectionHandler handler = null;
- try {
- handler = (IValidationSelectionHandler) element.createExecutableExtension(ATT_HANDLER_CLASS);
- handler.setValidationTypeString(selectionType);
- getValidationSelectionHandlers().add(handler);
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- private List<IValidationSelectionHandler> getValidationSelectionHandlers() {
- if (_validationSelectionHandlers == null)
- _validationSelectionHandlers = new ArrayList<IValidationSelectionHandler>();
- return _validationSelectionHandlers;
- }
-
- public Object getExtendedType(Object selection) {
- Object result = null;
- for (IValidationSelectionHandler handler : getValidationSelectionHandlers()) {
- result = handler.getBaseValidationType(selection);
- if (result != null)break;
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
deleted file mode 100644
index ee241be..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-/**
- * This class stores the value of the "action" attribute in the validator's plugin.xml contribution.
- */
-public class ValidatorActionFilter {
- public static final String ADD = "add"; //$NON-NLS-1$ // if the resource delta is an addition; this value is used in plugin.xml
- public static final String CHANGE = "change"; //$NON-NLS-1$ // if the resource delta is a change; this value is used in plugin.xml
- public static final String DELETE = "delete"; //$NON-NLS-1$ // if the resource delta is a removal; this value is used in plugin.xml
- public static final int ALL_ACTIONS = (IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
-
- private int _actionType = 0; // Default to 0, so that if an invalid filter is specified, then no
-
- // matter what the IResourceDelta is, the delta & _actionType will
- // always == 0. (i.e., the resource will never be filtered in)
-
- public ValidatorActionFilter() {
- super();
- }
-
- /**
- * Return the hexadecimal number which represents the type(s) of actions which this filter
- * allows in.
- */
- public int getActionType() {
- // Since IResourceDelta's constants are hexadecimal numbers,
- // it's nicer to return a corresponding hexadecimal, for bitwise OR,
- // than it is to have three boolean methods on this class, i.e.,
- // isAdd, isChange, isDelete.
- return _actionType;
- }
-
- /**
- * <p>
- * Parse the incoming string, which is extracted from the plugin.xml file, to determine the
- * value of the actionType.
- * <p>
- * The string can contain one, two, or three constants. If there is more than one constant, the
- * constants should be separated by a comma.
- * <p>
- * These are the three constants: add, change, delete. The order that the constants are
- * specified in does not matter. The constants are case-sensitive; i.e., ADD is not considered
- * the same as add.
- * <p>
- * If the action attribute is not defined, the default behaviour is to filter in all types of
- * actions: add, change, delete. (i.e., the same behaviour can be achieved by specifying "add,
- * change, delete" as the action attribute's value.
- * <p>
- * If the action attribute is defined, and none of the constants are defined, then the filter is
- * invalid, and will be ignored by the Validation Framework. (If none of the actions should be
- * filtered in, then the filter itself should not exist.)
- * <p>
- * If the action attribute is defined, and one of the constants is defined, then the form of the
- * action should be like this: <br>
- * <filter ... action="add"/>
- * <p>
- * If the action attribute is defined, and more than one constant is defined, then the form of
- * the action should be like this: <br>
- * <filter ... action="add, delete"/>
- * <p>
- * If the action attribute is defined, and an unknown constant is defined, then the unknown
- * constant will be ignored. For example, <br>
- * <filter ... action="ADD, delete"/> <br>
- * is the same as specifying <br>
- * <filter ... action="delete"/> <br>
- * and if all of the constants are unknown, the filter is invalid, and will be ignored by the
- * Validation Framework. e.g., <br>
- * <filter ... action="ADD, DELETE"/> <br>
- * is the same as not specifying a filter.
- * <p>
- * If the action attribute is defined, and a constant is defined more than once, the extra
- * constant is ignored. For example, <br>
- * <filter ... action="add, change, add"/> <br>
- * is the same as specifying <br>
- * <filter ... action="add, change"/>
- */
- public void setActionTypes(String actions) {
- if (actions == null) {
- // user has not defined the "action" element, so default to everything
- _actionType = ALL_ACTIONS;
- return;
- }
-
- final String COMMA = ","; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(actions, COMMA, false); // false means don't
- // return the comma
- // as part of the
- // string
- int isAdd = 0;
- int isChange = 0;
- int isDelete = 0;
- while (tokenizer.hasMoreTokens()) {
- String nextAction = tokenizer.nextToken().trim();
- if (nextAction.equals(ADD)) {
- isAdd = IResourceDelta.ADDED;
- } else if (nextAction.equals(CHANGE)) {
- isChange = IResourceDelta.CHANGED;
- } else if (nextAction.equals(DELETE)) {
- isDelete = IResourceDelta.REMOVED;
- }
- }
- _actionType = isAdd | isChange | isDelete;
- }
-
- public String toString() {
- final String ON = "on"; //$NON-NLS-1$
- final String OFF = "off"; //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer();
- buffer.append(" ActionFilter:"); //$NON-NLS-1$
- buffer.append(" add: " + (((getActionType() & IResourceDelta.ADDED) != 0) ? ON : OFF)); //$NON-NLS-1$
- buffer.append(" change: " + (((getActionType() & IResourceDelta.CHANGED) != 0) ? ON : OFF)); //$NON-NLS-1$
- buffer.append(" delete: " + (((getActionType() & IResourceDelta.REMOVED) != 0) ? ON : OFF)); //$NON-NLS-1$
- return buffer.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
deleted file mode 100644
index d51a217..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
+++ /dev/null
@@ -1,109 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This class represents the plugin.xml tags, for a validator, for both name filters and type
- * filters. i.e., if an object has name filter and type filter specified, the filter filters out
- * objects which are not both of that type and named like the filter.
- */
-public class ValidatorFilter {
- private ValidatorNameFilter _nameFilter;
- private ValidatorTypeFilter _typeFilter;
- private ValidatorActionFilter _actionFilter;
-
- ValidatorFilter() {
- super();
- _nameFilter = new ValidatorNameFilter();
- _typeFilter = new ValidatorTypeFilter();
- _actionFilter = new ValidatorActionFilter();
- }
-
- ValidatorFilter(String mustImplementClass) {
- this();
- _nameFilter = new ValidatorNameFilter();
- _typeFilter.setMustImplementClass(mustImplementClass);
- _actionFilter = new ValidatorActionFilter();
- }
-
- public boolean isApplicableAction(int resourceDelta) {
- return ((resourceDelta & _actionFilter.getActionType()) != 0);
- }
-
- /**
- * Returns true if the given resource's name matches the name filter.
- *
- * e.g. if the name filter is "*.java", and this resource is "readme.txt", this method will
- * return false. If the resource is named "readme.java", this method will return true.
- */
- boolean isApplicableName(IResource resource) {
- return _nameFilter.isApplicableName(resource);
- }
-
- /**
- * Returns true if the given resource's type matches the type filter.
- *
- * e.g. if the type filter is "IFile", and this resource is "IProject", this method will return
- * false. If the resource is an IFile, this method will return true.
- */
- boolean isApplicableType(IResource resource) {
- return _typeFilter.isApplicableType(resource);
- }
-
- public void setActionFilter(String actions) {
- _actionFilter.setActionTypes(actions);
- }
-
- /**
- * Sets the name filter.
- */
- void setNameFilter(String filter, String isCaseSensitiveString) {
- _nameFilter.setNameFilter(filter);
- if(filter != null)
- _nameFilter.setNameFilterExtension(getFilterExt(filter));
- _nameFilter.setCaseSensitive(isCaseSensitiveString);
- }
-
- private String getFilterExt(String filter) {
- return filter.substring(filter.indexOf(".") + 1); //$NON-NLS-1$
- }
-
-
- /**
- * Sets the type filter.
- */
- void setTypeFilter(String filter) {
- _typeFilter.setTypeFilter(filter);
- }
-
- public String toString() {
- final String lineSep = System.getProperty("line.separator"); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer();
- buffer.append("ValidatorFilter:"); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" nameFilter = " + _nameFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" typeFilter = " + _typeFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- buffer.append(" actionFilter = " + _actionFilter); //$NON-NLS-1$
- buffer.append(lineSep);
- return buffer.toString();
- }
-
- /**
- * @return Returns the _nameFilter.
- */
- public ValidatorNameFilter get_nameFilter() {
- return _nameFilter;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
deleted file mode 100644
index 6b26bf6..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
+++ /dev/null
@@ -1,548 +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;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-import org.osgi.framework.Bundle;
-
-/**
- * This class stores information, as specified by a validator's plugin.xml tags. There is one
- * ValidatorMetaData for each Validator. No Validator should attempt to access its
- * ValidatorMetaData; it is for use by the base framework only.
- */
-public class ValidatorMetaData {
- private final ValidatorFilter[] _filters;
- private final ValidatorNameFilter[] _projectNatureFilters;
- private final String[] _facetFilters;
- private final AtomicReference<IValidator> _validator = new AtomicReference<IValidator>();
- private final AtomicReference<IWorkbenchContext> _helper = new AtomicReference<IWorkbenchContext>();
- private final String _validatorDisplayName;
- private final String _validatorUniqueName;
-
- /**
- * The list of class names of every validator which this validator aggregates. For
- * example, if the EJB Validator instantiated another validator, and started its validate
- * method, then that instantiated class' name should be in this list.
- */
- private final String[] _aggregatedValidators;
- private final String[] _contentTypeIds;
- private final String[] _validatorNames;
- private final String _pluginId;
- private final boolean _supportsIncremental;
- private final boolean _supportsFullBuild;
- private final boolean _isEnabledByDefault;
- private final MigrationMetaData _migrationMetaData;
- private final int _ruleGroup;
- private final boolean _async;
- private final boolean _dependentValidator;
- private final String[] _markerIds;
- private final String _helperClassName;
- private final IConfigurationElement _helperClassElement;
- private final IConfigurationElement _validatorClassElement;
- private volatile boolean _cannotLoad;
- private volatile boolean _manualValidation = true;
- private volatile boolean _buildValidation = true;
- private final Map<IValidatorJob, IWorkbenchContext> _helpers =
- Collections.synchronizedMap( new HashMap<IValidatorJob, IWorkbenchContext>() );
- private final Expression _enablementExpression;
-
- ValidatorMetaData(boolean async, String[] aggregatedValidators, boolean isEnabledByDefault, boolean supportsIncremental,
- boolean supportsFullBuild, IConfigurationElement helperClassElement, String helperClassName,
- MigrationMetaData migrationMetaData, String pluginId, int ruleGroup, IConfigurationElement validatorClassElement,
- String validatorDisplayName, String validatorUniqueName, String[] contentTypeIds, boolean dependentValidator,
- Expression enablementExpression, String[] facetFilters, ValidatorFilter[] filters,
- ValidatorNameFilter[] projectNatureFilters, String[] markerIds) {
- _async = async;
- _aggregatedValidators = aggregatedValidators;
- _isEnabledByDefault = isEnabledByDefault;
- _supportsIncremental = supportsIncremental;
- _supportsFullBuild = supportsFullBuild;
- _helperClassElement = helperClassElement;
- _helperClassName = helperClassName;
- _migrationMetaData = migrationMetaData;
- _pluginId = pluginId;
- _ruleGroup = ruleGroup;
- _validatorClassElement = validatorClassElement;
- _validatorDisplayName = validatorDisplayName;
- _validatorUniqueName = validatorUniqueName;
- _contentTypeIds = contentTypeIds;
- _dependentValidator = dependentValidator;
- _enablementExpression = enablementExpression;
- _facetFilters = facetFilters;
- _filters = filters;
- _projectNatureFilters = projectNatureFilters;
- _markerIds = markerIds;
- _validatorNames = buildValidatorNames();
- }
-
- protected String[] getFacetFilters() {
- return _facetFilters;
- }
-
- public List<String> getNameFilters() {
- List<String> nameFilters = new ArrayList<String>();
- if (_filters != null && _filters.length > 0) {
- for (ValidatorFilter filter : _filters) {
- ValidatorNameFilter nameFilter = filter.get_nameFilter();
- if (nameFilter != null) {
- nameFilters.add(nameFilter.getNameFilter());
- }
- }
- }
- return nameFilters;
- }
-
- /**
- * Return the list of class names of the primary validator and its aggregates.
- */
- public String[] getValidatorNames() {
- return _validatorNames;
- }
-
- private String[] buildValidatorNames() {
- int aLength = (_aggregatedValidators == null) ? 0 : _aggregatedValidators.length;
- String [] validatorNames = new String[aLength + 1]; // add 1 for the primary validator name
- validatorNames[0] = getValidatorUniqueName();
- if (_aggregatedValidators != null) {
- System.arraycopy(_aggregatedValidators, 0, validatorNames, 1, aLength);
- }
- return validatorNames;
- }
-
- /**
- * Return the list of class names of every validator which this validator aggregates. For
- * example, if the EJB Validator instantiated another validator, and started its validate
- * method, then that instantiated class' name should be in this list.
- */
- public String[] getAggregatedValidatorNames() {
- return _aggregatedValidators;
- }
-
- /**
- * Return the name/type filter pairs.
- */
- public ValidatorFilter[] getFilters() {
- return _filters;
- }
-
- /**
- * Return true if this vmd's helper and validator have been instantiated, and also if this
- * validator's plugin is active.
- */
- public boolean isActive() {
- if (_helperClassElement != null) {
- return false;
- }
-
- if (_validatorClassElement != null) {
- return false;
- }
-
- Bundle bundle = Platform.getBundle(_pluginId);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
-
- return false;
- }
-
- /**
- * This method will throw an InstantiationException if the helper cannot be instantiated, e.g.,
- * if the helper's plugin is disabled for some reason. Before the InstantiationException is
- * thrown, this validator will be disabled.
- *
- * The IWorkbenchContext must ALWAYS have its project set before it is used; but it can't be
- * created with the IProject. So, before using the single instance, always initialize that
- * instance with the IProject.
- *
- * If this validator supports asynchronous validation, then instead of maintaining a single the
- * helper instance, create a new IWorkbenchContext instance every time that the helper is needed.
- * This feature is provided because several validation Runnables may be queued to run, and if
- * those Runnables's project is different from the current validation's project, then the
- * current validation will suddenly start validating another project.
- */
- //TODO just want to remember to figure out the many-temporary-objects problem if this method
- // continues to new an IValidationContext every time - Ruth
- public IWorkbenchContext getHelper(IProject project) throws InstantiationException {
- IWorkbenchContext helper = _helper.get();
- if (helper != null){
- IProject oldProject = helper.getProject();
- if ((oldProject == null) || !(oldProject.equals(project)))helper.setProject(project);
- return helper;
- }
-
- helper = ValidationRegistryReader.createHelper(_helperClassElement, _helperClassName);
- if (helper == null)helper = new WorkbenchContext();
-
- if ((helper.getProject() == null) || !(helper.getProject().equals(project))) {
- helper.setProject(project);
- }
- if (_helper.compareAndSet(null, helper))return helper;
- return _helper.get();
- }
-
- /**
- * cannotLoad is false if both the IValidator and IWorkbenchContext instance can be instantiated.
- */
- private void setCannotLoad() {
- _cannotLoad = true;
- }
-
- /**
- * Return false if both the IValidator and IWorkbenchContext instance can be instantiated.
- *
- * @return boolean
- */
- public boolean cannotLoad() {
- return _cannotLoad;
- }
-
- public MigrationMetaData getMigrationMetaData() {
- return _migrationMetaData;
- }
-
- /**
- * Return the IRuleGroup integer indicating which groups of rules this validator recognizes.
- */
- public int getRuleGroup() {
- return _ruleGroup;
- }
-
- /**
- * Return the filters which identify which project(s) this validator may run on.
- */
- ValidatorNameFilter[] getProjectNatureFilters() {
- return _projectNatureFilters;
- }
-
- /**
- * This method returns the validator if it can be loaded; if the validator cannot be loaded,
- * e.g., if its plugin is disabled for some reason, then this method throws an
- * InstantiationException. Before the CoreException is thrown, this validator is disabled.
- */
- public IValidator getValidator() throws InstantiationException {
- IValidator val = _validator.get();
- if (val != null)return val;
-
- val = ValidationRegistryReader.createValidator(_validatorClassElement, getValidatorUniqueName());
-
- if (val == null) {
- setCannotLoad();
- throw new InstantiationException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_DISABLEV, new String[]{getValidatorUniqueName()}));
- }
- if (_validator.compareAndSet(null, val))return val;
- return _validator.get();
- }
-
- public String getValidatorDisplayName() {
- return _validatorDisplayName;
- }
-
- public String getValidatorUniqueName() {
- return _validatorUniqueName;
- }
-
- /**
- * If the resource is applicable to the Validator which this ValidatorMetaData is associated
- * with, return true; else return false.
- *
- * A resource is applicable if it passes the name/type filters. This method is called if there
- * is no resource delta (i.e., a full validation).
- */
- public boolean isApplicableTo(IResource resource) {
- return isApplicableTo(resource, ValidatorActionFilter.ALL_ACTIONS);
- }
-
- /**
- * If the resource is applicable to the Validator which this ValidatorMetaData is associated
- * with, return true; else return false.
- *
- * A resource is applicable if it passes the name/type filters.
- */
- public boolean isApplicableTo(IResource resource, int resourceDelta) {
- // If no filters are specified, then every type of resource should be validated/trigger a
- // rebuild of the model cache.
- // Also make sure no content type id is specified (BUG 193816)
- if (_filters == null && getContentTypeIds() == null)return true;
-
- return isApplicableTo(resource, resourceDelta, _filters);
- }
-
- /**
- * Return true if the resource passes the name/type filters for this validator.
- */
- boolean isApplicableTo(IResource resource, int resourceDelta, ValidatorFilter[] filters) {
- // Are any of the filters satisfied? (i.e., OR them, not AND them.)
- // make sure filters is not null (BUG 193816)
- if (filters != null && checkIfValidSourceFile(resource)) {
- for (ValidatorFilter filter : filters) {
- if (filter.isApplicableType(resource)
- && filter.isApplicableName(resource)
- && filter.isApplicableAction(resourceDelta)) {
- return true;
- }
- }
- }
- if (getContentTypeIds() != null) {
- IContentDescription description = null;
- try {
- if (resource.getType() == IResource.FILE && resource.exists())
- description = ((IFile) resource).getContentDescription();
- } catch (CoreException e) {
- //Resource exceptions
- }
- if (description == null)return false;
- if (isApplicableContentType(description))return true;
- }
- return false;
- }
-
- private boolean checkIfValidSourceFile(IResource file) {
- if (file.getType() == IResource.FILE) {
- IProjectValidationHelper helper = ValidationHelperRegistryReader.getInstance().getValidationHelper();
- IProject project = file.getProject();
- if (helper == null || project == null)
- return true;
- IContainer[] outputContainers = helper.getOutputContainers(project);
- IContainer[] sourceContainers = helper.getSourceContainers(project);
- if(outputContainers != null && sourceContainers != null){
- for (int i=0; i<outputContainers.length; i++) {
- String outputPath = outputContainers[i].getProjectRelativePath().makeAbsolute().toString();
- String filePath = file.getProjectRelativePath().makeAbsolute().toString();
- if (filePath.startsWith(outputPath)) {
- //The file is in an output container.
- //If it is a source container return true and false otherwise.
- for (int j=0;j<sourceContainers.length; j++) {
- if(outputContainers[i].equals(sourceContainers[j])){
- return true;
- }
- return false;
- }
- }
- }
- }
- }
- return true;
- }
-
-
- /**
- * If this validator recognizes the project nature, whether included or excluded, return the
- * name filter which describes the nature. Otherwise return null.
- */
- ValidatorNameFilter findProjectNature(String projId) {
- if (projId == null) {
- return null;
- }
-
- if (_projectNatureFilters == null) {
- // If no tag is specified, this validator is configured on all IProjects
- return null;
- }
-
- for (int i = 0; i < _projectNatureFilters.length; i++) {
- ValidatorNameFilter filter = _projectNatureFilters[i];
- // In this case, we're not checking if the project is an instance of the filter class,
- // but if it has the Nature specified in the filter class.
- String projectNatureID = filter.getNameFilter();
- if (projId.equals(projectNatureID)) {
- return filter;
- }
- }
- return null;
- }
-
- /**
- * Convenience method. Rather than store the is-this-vmd-configured-on-this-IProject algorithm
- * in two places, refer back to the reader's cache.
- */
- public boolean isConfiguredOnProject(IProject project) {
- return ValidationRegistryReader.getReader().isConfiguredOnProject(this, project);
- }
-
- public boolean isEnabledByDefault() {
- return _isEnabledByDefault;
- }
-
- public boolean isIncremental() {
- return _supportsIncremental;
- }
-
- public boolean isFullBuild() {
- return _supportsFullBuild;
- }
-
- /**
- * Return true if the validator is thread-safe and can be run asynchronously.
- */
- public boolean isAsync() {
- return _async;
- }
-
- public String toString() {
- return getValidatorUniqueName();
- }
-
- public final static class MigrationMetaData {
- private Set<String[]> _ids;
-
- public MigrationMetaData() {
- }
-
- public void addId(String oldId, String newId) {
- if (oldId == null)return;
- if (newId == null)return;
-
- String[] ids = new String[]{oldId, newId};
- getIds().add(ids);
- }
-
- public Set<String[]> getIds() {
- if (_ids == null)_ids = new HashSet<String[]>();
- return _ids;
- }
- }
-
- public boolean isDependentValidator() {
- return _dependentValidator;
- }
-
- /**
- * @return Returns the markerId.
- */
- public String[] getMarkerIds() {
- return _markerIds;
- }
-
- public boolean isBuildValidation() {
- return _buildValidation;
- }
-
- public void setBuildValidation(boolean buildValidation) {
- _buildValidation = buildValidation;
- }
-
- public boolean isManualValidation() {
- return _manualValidation;
- }
-
- public void setManualValidation(boolean manualValidation) {
- _manualValidation = manualValidation;
- }
-
- /**
- * Determines if the validator described by this metadata object is a delegating validator.
- * @return true if the validator described by this metadata object is a delegating validator, false otherwise.
- */
- public boolean isDelegating() {
- String targetID = getValidatorUniqueName();
- return ValidatorDelegatesRegistry.getInstance().hasDelegates(targetID);
- }
-
-
- public IValidator createValidator() throws InstantiationException {
- return ValidationRegistryReader.createValidator(_validatorClassElement, getValidatorUniqueName());
- }
-
- public IWorkbenchContext createHelper(IProject project) throws InstantiationException {
- IWorkbenchContext helper = ValidationRegistryReader.createHelper(_helperClassElement, _helperClassName);
- if (helper == null) {
- helper = new WorkbenchContext();
- }
- helper.setProject(project);
- return helper;
- }
-
- public void addHelper( IValidatorJob validator, IWorkbenchContext helper ){
- _helpers.put( validator, helper );
- }
-
- public void removeHelper( IValidatorJob validator ){
- _helpers.remove( validator );
- }
-
- private IWorkbenchContext getHelper( IValidatorJob validator ){
- return _helpers.get( validator );
- }
-
- public IWorkbenchContext getHelper( IProject project, IValidator validator ){
-
- if( validator instanceof IValidatorJob ){
- IWorkbenchContext helper = getHelper( (IValidatorJob)validator );
- if( helper == null ){
- try{
- helper = getHelper( project );
- return helper;
- }catch (InstantiationException e) {
- e.printStackTrace();
- }
- }
- return helper;
- }
- else{
- try {
- IWorkbenchContext helper = getHelper( project );
- return helper;
- } catch (InstantiationException e) {
- e.printStackTrace();
- }
- }
-
- return null;
- }
-
- public Expression getEnablementExpresion() {
- return _enablementExpression;
- }
-
-public String[] getContentTypeIds() {
- return _contentTypeIds;
-}
-
-
-private boolean isApplicableContentType(IContentDescription desc){
-
- IContentType ct = desc.getContentType();
- String[] applicableContentTypes = getContentTypeIds();
- if (applicableContentTypes != null) {
- for (int i = 0; i < applicableContentTypes.length; i ++){
- if(applicableContentTypes[i].equals(ct.getId()))
- return true;
- }
- }
- return false;
-}
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java
deleted file mode 100644
index 946cfba..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java
+++ /dev/null
@@ -1,170 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * Represents a name filter tag in a validator's plugin.xml file. e.g. <filter name="*.*"> Then
- * this class would store the "*.*", and provide the wildcard matching functionality.
- */
-public class ValidatorNameFilter {
- private String _nameFilter;
- private String nameFilterExtension;
- private boolean _include = true; // by default, filter in the IFile specified
- private final static String WILDCARD = "*"; //$NON-NLS-1$
- private boolean _isCaseSensitive = true; // by default, the filter name is case-sensitive
-
- /**
- * Insert the method's description here. Creation date: (12/4/00 11:08:41 AM)
- */
- ValidatorNameFilter() {
- //default
- }
-
- /**
- * Get the filter, as specified in plugin.xml
- */
- String getNameFilter() {
- return _nameFilter;
- }
-
- boolean isCaseSensitive() {
- return _isCaseSensitive;
- }
-
- boolean isInclude() {
- return _include;
- }
-
- /**
- * Return true if the given resource is both applicable and include="true".
- */
- boolean isApplicableTo(IResource resource) {
- return (isApplicableName(resource) && isInclude());
- }
-
- protected void setNameFilterExtension(String filterExt) {
- nameFilterExtension = filterExt;
- }
-
- /**
- * Returns true if the name of the resource matches the filter, or if there is no filter
- * specified.
- */
- public boolean isApplicableName(IResource resource) {
- // If name filter is null, means filter out no names.
- // Otherwise, return true only if the given name matches
- // the name filter.
- if (_nameFilter == null)
- return true;
-
- String name = resource.getName();
-// return true if the file name is exact match of the _nameFilter
- if (name.equalsIgnoreCase(_nameFilter))
- return true;
-
- int indexOfStarDot = _nameFilter.indexOf("*."); //$NON-NLS-1$
-
- //return value if the filter name extension matches the extension
- //of the resource
- if (indexOfStarDot != -1) {
- String nameExtension = name.substring(name.lastIndexOf(".") + 1); //$NON-NLS-1$
- return nameFilterExtension.equalsIgnoreCase(nameExtension);
- }
-
- if (!isCaseSensitive()) {
- name = name.toLowerCase();
- }
-
- return verifyNameMatch(_nameFilter, name);
- }
-
- void setInclude(String includeValue) {
- if (includeValue != null) {
- setInclude(Boolean.valueOf(includeValue).booleanValue());
- }
- }
-
- void setInclude(boolean includeBool) {
- _include = includeBool;
- }
-
- /**
- * Set the filter, as specified in plugin.xml
- */
- void setNameFilter(String filter) {
- _nameFilter = filter;
- }
-
- void setCaseSensitive(String isCaseSensitiveString) {
- if (isCaseSensitiveString != null) {
- // only change the value from the default if the case-sensitive attribute is defined
- _isCaseSensitive = Boolean.valueOf(isCaseSensitiveString).booleanValue();
- }
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("NameFilter:\n\tnameFilter = "); //$NON-NLS-1$
- buffer.append(_nameFilter);
- return buffer.toString();
- }
-
- /**
- * Return true if the given name matches the given filter.
- *
- * The only filter wildcard allowed is '*'.
- */
- static boolean verifyNameMatch(final String filter, String name) {
- /*
- * There are eight possible wildcard combinations, given that a wildcard may, if present, be
- * at the beginning, middle, or end of a name; or any combination of those positions. i.e.,
- *
- * beginning middle end 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1
- *
- */
- StringTokenizer tokenizer = new StringTokenizer(filter, WILDCARD, true);
- boolean wildcardFlag = false;
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (token.equals(WILDCARD)) {
- wildcardFlag = true;
- } else {
- if (wildcardFlag) {
- int tokenIndex = name.indexOf(token);
- if (tokenIndex >= 0) {
- name = name.substring(tokenIndex + token.length());
- } else {
- return false;
- }
- } else {
- if (name.startsWith(token)) {
- int tokenIndex = token.length();
- name = name.substring(tokenIndex);
- } else {
- return false;
- }
- }
- wildcardFlag = false;
- }
- }
- if (!name.equals("")) { //$NON-NLS-1$
- if (!wildcardFlag) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
deleted file mode 100644
index f495aa6..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
+++ /dev/null
@@ -1,146 +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;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * Represents a type filter tag in a validator's plugin.xml file. e.g. <filter
- * objectClass="com.ibm.foo.MyClass"> Then this class would store the "com.ibm.foo.MyClass", and
- * provide the "instanceof" matching functionality.
- */
-public class ValidatorTypeFilter {
- private Class _typeFilterClass;
- private String _mustImplementClass; // the type set in setTypeFilter must implement the
-
- // class/interface identified by this fully-qualified
- // Java string.
-
- ValidatorTypeFilter() {
- //default
- }
-
- ValidatorTypeFilter(String mustImplementClass) {
- setMustImplementClass(mustImplementClass);
- }
-
- /**
- * Type filters are allowed only for certain types of classes. This method returns the name of
- * the class which this type must implement before it can be a filter.
- */
- String getMustImplementClass() {
- return _mustImplementClass;
- }
-
- /**
- * Return the type filter as a java.lang.Class object.
- */
- Class getTypeFilterClass() {
- return _typeFilterClass;
- }
-
- /**
- * Returns true if the resource passed in either an instance of the type filter class, or if
- * there is no type filter class defined in plugin.xml.
- */
- public boolean isApplicableType(IResource resource) {
- // If type filter is null, means filter out no types.
- // Otherwise, return true only if the given type is an instance of
- // the type filter.
- if (_typeFilterClass == null)
- return true;
-
- // If the resource is an instance of the type filter class.
- return isInstance(resource.getClass(), _typeFilterClass);
- }
-
- /**
- * Checks if filterClass is a parent (interface or superclass) of objectClass.
- */
- boolean isInstance(Class objectClass, Class filterClass) {
- // The java.lang.Class.isInstance call doesn't check interfaces fully.
- // i.e., if I have two interfaces, A and B, and B extends A but
- // doesn't implement A, then the isInstance call will return false.
- //
- // So, instead of using Class.isInstance, do the checking myself.
- for (Class cl = objectClass; cl != null; cl = cl.getSuperclass()) {
- if (cl.getName().equals(filterClass.getName())) {
- return true;
- }
- Class[] clInterfaces = cl.getInterfaces();
- for (int i = 0; i < clInterfaces.length; i++) {
- if (clInterfaces[i].getName().equals(filterClass.getName())) {
- return true;
- }
- return isInstance(clInterfaces[i], filterClass);
- }
- }
- return false;
- }
-
- /**
- * Type filters are allowed only for certain types of classes. This method sets the name of the
- * class which this type must implement before it can be a filter.
- */
- void setMustImplementClass(String className) {
- _mustImplementClass = className;
- }
-
- /**
- * If the filter implements the mustImplementClass (in ValidatorFilter's case, IResource), then
- * this is a valid filter, and store the filter value.
- */
- void setTypeFilter(String filter) {
- Class filterClass = null;
- Class mustImplementClass = null;
-
- if (filter == null) {
- _typeFilterClass = null;
- return;
- }
-
- try {
- filterClass = Class.forName(filter);
- if (getMustImplementClass() != null) {
- mustImplementClass = Class.forName(getMustImplementClass());
-
- // If the filter class is not an instance of mustImplementClass
- if (!isInstance(filterClass, mustImplementClass)) {
- _typeFilterClass = null;
- if (Tracing.isLogging()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_TYPE_FILTER),
- new Object[]{filter, getMustImplementClass()});
- Tracing.log("ValidatorTypeFilter-01: ", result); //$NON-NLS-1$
- }
- }
- }
- } catch (ClassNotFoundException exc) {
- _typeFilterClass = null;
- if (Tracing.isLogging()) {
- Tracing.log("ValidatorTypeFilter-02: The class named " + filter + //$NON-NLS-1$
- " cannot be instantiated because it does not exist. Check the spelling of the name, " + //$NON-NLS-1$
- "in the validator's plugin.xml contribution, and try restarting eclipse again."); //$NON-NLS-1$
- }
- return;
- }
- _typeFilterClass = filterClass;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("TypeFilter:"); //$NON-NLS-1$
- buffer.append(" _typeFilterClass = " + _typeFilterClass.getName()); //$NON-NLS-1$
- buffer.append(" _mustImplementClass = " + _mustImplementClass); //$NON-NLS-1$
- return buffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
deleted file mode 100644
index d143f9b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.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
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * This class is to be used as a base class by clients who want to provide
- * alternate validator implementations for a given validator type.
- *
- * It locates the currently configured delegate for this validator and calls its
- * validate method.
- *
- * @see IValidator
- * @see IDelegatingValidator
- *
- * <p>
- * <b>Note:</b> This class/interface 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.
- * </p>
- */
-public class DelegatingValidator extends AbstractValidator implements IDelegatingValidator
-{
- public DelegatingValidator()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void cleanup(IReporter reporter)
- {
- // [Issue] This method does not get passed the validation context. How are
- // going to know the delegate in order to invoke its cleanup method?
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
- * org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
- {
- validateInJob(helper, reporter);
- }
-
- /**
- * Wraps the original reporter instance to make it look like this validator is
- * the one generating messages. This is needed because the framework ignores
- * messages coming from the delegate validator because it is not registered
- * with the validation framework.
- */
- private class DelegatingReporter implements IReporter
- {
- /**
- * The reporter passed originally to the delegating validator by the
- * framework.
- */
- IReporter delegatingReporter;
-
- /**
- * The delegating validator.
- */
- IValidator delegatingValidator;
-
- /**
- * Constructor.
- *
- * @param validator
- * the original validator.
- * @param reporter
- * the reporter originally passed to the delegating validator.
- */
- DelegatingReporter(IValidator validator, IReporter reporter)
- {
- delegatingReporter = reporter;
- delegatingValidator = validator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void addMessage(IValidator origin, IMessage message)
- {
- delegatingReporter.addMessage(delegatingValidator, message);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void displaySubtask(IValidator validator, IMessage message)
- {
- delegatingReporter.displaySubtask(delegatingValidator, message);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#getMessages()
- */
- public List getMessages()
- {
- return delegatingReporter.getMessages();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#isCancelled()
- */
- public boolean isCancelled()
- {
- return delegatingReporter.isCancelled();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)
- */
- public void removeAllMessages(IValidator origin)
- {
- delegatingReporter.removeAllMessages(delegatingValidator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * java.lang.Object)
- */
- public void removeAllMessages(IValidator origin, Object object)
- {
- delegatingReporter.removeAllMessages(delegatingValidator, object);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator,
- * java.lang.Object, java.lang.String)
- */
- public void removeMessageSubset(IValidator validator, Object obj, String groupName)
- {
- delegatingReporter.removeMessageSubset(delegatingValidator, obj, groupName);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
- * org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException
- {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(this);
- String validatorName = vmd.getValidatorDisplayName();
-
- // We need to ensure that the context is an IProjectValidationContext. The
- // limitation of using an IValidationContext is that it does not readily
- // provide the project the validator is being invoked upon.
-
- if (!(helper instanceof IProjectValidationContext))
- {
- throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_WRONG_CONTEXT_FOR_DELEGATE, new String[] { validatorName })));
- }
-
- IProjectValidationContext projectContext = (IProjectValidationContext) helper;
- IProject project = projectContext.getProject();
-
- ValidatorDelegateDescriptor delegateDescriptor = null;
-
- try
- {
- ProjectConfiguration projectConfig = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- delegateDescriptor = projectConfig.getDelegateDescriptor(vmd);
- }
- catch (InvocationTargetException e)
- {
- // Already dealt with by the framework.
- }
- finally
- {
- if (delegateDescriptor == null)
- {
- throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_NO_DELEGATE, new String[] { vmd.getValidatorDisplayName() })));
- }
- }
-
- IValidatorJob delegate = (IValidatorJob)delegateDescriptor.getValidator();
-
- // We need to make it look like this validator is the one generating
- // messages so we wrap the reporter and use this validator as the source.
- // The validation framework does not recognize our validators because they
- // are not registered directly with the framework.
- // We could make them work like the aggregated validators but that would
- // create problems with markers not being cleaned up if someone switches
- // validators.
- // TODO : Maybe we could clear all the markers generated by a delegate when
- // the user chooses a different delegate implementation?
-
- DelegatingReporter delegatingReporter = new DelegatingReporter(this, reporter);
-
- IStatus status = delegate.validateInJob(helper, delegatingReporter);
-
- return status;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)
- */
- public ISchedulingRule getSchedulingRule(IValidationContext helper)
- {
- return null;
- }
-
-@Override
-public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- return null;
-}
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
deleted file mode 100644
index e779ed9..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * A delegating validator delegates the actual validation work to a delegate
- * validator. This is a marker interface used internally by the framework to
- * determine if a delegate is a delegating validator.
- *
- * [Issue] Could/should this interface be replaced with an attribute on the
- * validators extension definition?
- *
- * <p>
- * <b>Note:</b> This class/interface 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.
- * </p>
- */
-public interface IDelegatingValidator extends IValidatorJob
-{
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
deleted file mode 100644
index 51910e0..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * ValidatorDelegateDescriptor stores information about a delegate validator.
- * <p>
- * It is also used to store the instance of the validator it describes. To
- * obtain the instance call getValidator().
- * </p>
- */
-public class ValidatorDelegateDescriptor {
- /**
- * The platform configuration element describing this delegate.
- */
- private IConfigurationElement _delegateConfiguration;
-
- /**
- * The delegating validator's ID.
- */
- private String _delegatingValidatorID;
-
- /**
- * The delegate's ID.
- */
- private String _id;
-
- /**
- * The delegate's display name.
- */
- private String _name;
-
- /**
- * Constructs a descriptor.
- *
- * @param id
- * The delegate's unique id. Must be unique in the context of a
- * delegating validator.
- * @param delegateConfiguration
- * The delegates configuration element
- * @param delegateName
- * The delegate's display name.
- * @param targetValidatorID
- * The target validator's unique id.
- */
- public ValidatorDelegateDescriptor(String id,
- IConfigurationElement delegateConfiguration, String delegateName,
- String targetValidatorID) {
-
- assert id != null;
- assert delegateConfiguration != null;
- assert targetValidatorID != null;
-
- _id = id;
- _delegateConfiguration = delegateConfiguration;
- _name = delegateName;
- _delegatingValidatorID = targetValidatorID;
- }
-
- /**
- * Provides the delegate's ID.
- *
- * @return a string with the fully qualified class name of this validator
- * implementation.
- */
- public String getId() {
- return _id;
- }
-
- /**
- * Provides the delegate's name.
- *
- * @return a String with the validator's display name.
- */
- public String getName() {
- return _name;
- }
-
- /**
- * Retrieves the target validator's ID.
- *
- * @return a String with the fully qualified class name of the delegating
- * validator who will delegate its implementation to the validator
- * described by this descriptor.
- */
- public String getTargetID() {
- return _delegatingValidatorID;
- }
-
- /**
- * Provides the instance of the validator delegate pointed to by this descriptor.
- *
- * @return an IValidator instance.
- * @throws ValidationException
- */
- public IValidator getValidator() throws ValidationException {
- try {
- IValidator delegate = (IValidator) _delegateConfiguration
- .createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
- return delegate;
- } catch (CoreException e) {
- handleException(e);
- }
- return null;
- }
-
- /**
- * Answer an AbstractValidator if one has been defined, otherwise answer null.
- */
- public AbstractValidator getValidator2() throws ValidationException {
- try {
- Object o = _delegateConfiguration
- .createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
- if (o instanceof AbstractValidator)
- return (AbstractValidator) o;
- } catch (CoreException e) {
- handleException(e);
- }
- return null;
- }
-
- private void handleException(CoreException e) throws ValidationException {
- ValidationPlugin.getPlugin().handleException(e);
- String delegatingValidatorName = getTargetID();
- ValidatorMetaData vmd = ValidationRegistryReader.getReader()
- .getValidatorMetaData(getTargetID());
- if (vmd != null)delegatingValidatorName = vmd.getValidatorDisplayName();
- throw new ValidationException(new LocalizedMessage(
- IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_CANNOT_INSTANTIATE_DELEGATE, new String[] { getName(), delegatingValidatorName })));
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
deleted file mode 100644
index 3ea034f..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
+++ /dev/null
@@ -1,223 +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.internal.delegates;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * ValidatorDelegatesRegistry is a singleton used to store validator delegate
- * descriptors for each delegating validator.
- */
-public class ValidatorDelegatesRegistry {
-
- /**
- * The one and only instance of this registry.
- */
- private static ValidatorDelegatesRegistry _instance;
-
- /**
- * Provides the one and only instance of this class.
- *
- * The actual platform extension registry reading happens at this time.
- *
- * @see ValidatorDelegatesRegistryReader
- *
- * @return the validator delegates registry singleton instance.
- */
- public static ValidatorDelegatesRegistry getInstance() {
- if (_instance == null) {
- ValidatorDelegatesRegistry instance = new ValidatorDelegatesRegistry();
- ValidatorDelegatesRegistryReader reader = new ValidatorDelegatesRegistryReader(instance);
- reader.readRegistry();
- instance.initDefaults();
- _instance = instance;
- }
-
- return _instance;
- }
-
- /**
- * Determine if the product defined any default delegate validators, by setting the old
- * DELEGATES_PREFERENCE preference in the default preference scope. If they did, we remember
- * them, so that if we every need to return a default for the delegating validator, we can return the one
- * that the product requested.
- */
- private void initDefaults() {
- // This code was copied from the ValidationConfiguration#deserializeDelegates() method. The code was copied because this
- // change is part of a patch and I didn't want to disturb the ValidationConfiguration class.
-
- IEclipsePreferences prefs = new DefaultScope().getNode(ValidationPlugin.PLUGIN_ID);
- String delegatePref = prefs.get("DELEGATES_PREFERENCE", null); //$NON-NLS-1$
- if (delegatePref == null)return;
-
- int delegatesIndex = delegatePref.indexOf(ConfigurationConstants.DELEGATE_VALIDATORS);
- String delegates = delegatePref.substring(delegatesIndex + ConfigurationConstants.DELEGATE_VALIDATORS.length(), delegatePref.length());
-
- if (delegates == null)return;
-
- _defaultDelegates = new HashSet<String>(10);
- StringTokenizer tokenizer = new StringTokenizer(delegates, ConfigurationConstants.ELEMENT_SEPARATOR);
- while (tokenizer.hasMoreTokens()) {
- String delegateConfiguration = tokenizer.nextToken();
- int separatorIndex = delegateConfiguration.indexOf(ConfigurationConstants.DELEGATES_SEPARATOR);
-// String targetID = delegateConfiguration.substring(0, separatorIndex);
- String delegateID = delegateConfiguration.substring(separatorIndex + 1);
- _defaultDelegates.add(delegateID);
- }
-
- }
-
-/**
- * The map of target validator id to Map of delegates by id.
- */
- private Map<String, Map<String,ValidatorDelegateDescriptor>> _delegatesByTarget =
- new HashMap<String, Map<String,ValidatorDelegateDescriptor>>();
-
- /**
- * Validator ids that have been defined by the product to be the default validators, for some of the delegating validtors.
- */
- private Set<String> _defaultDelegates;
-
- /**
- * Adds a descriptor to the registry.
- *
- * @param descriptor
- * The descriptor to add. Must not be null.
- */
- void add(ValidatorDelegateDescriptor descriptor) {
- if (descriptor == null)return;
-
- String targetID = descriptor.getTargetID();
-
- Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
-
- if (delegates == null) {
- delegates = new HashMap<String,ValidatorDelegateDescriptor>();
- _delegatesByTarget.put(targetID, delegates);
- }
-
- delegates.put(descriptor.getId(), descriptor);
- }
-
- /**
- * Provides the default delegate ID for the given delegating validator ID.
- *
- * @param targetID
- * The delegating validator's ID.
- * @return a String with the ID of the default delegate.
- */
- public String getDefaultDelegate(String targetID)
- {
- Map<String,ValidatorDelegateDescriptor> delegates = getDelegateDescriptors(targetID);
-
- if (delegates == null)return null;
-
- if (_defaultDelegates != null){
- for (ValidatorDelegateDescriptor vdd : delegates.values()){
- String id = vdd.getId();
- if (_defaultDelegates.contains(id))return id;
- }
- }
-
- // TODO: Implement a default attribute and use that to get the default?
- // What happens if two or more delegates claim to be the default one?
- // For now, just pick the first one in the list.
-
- Iterator<ValidatorDelegateDescriptor> delegatesIterator = delegates.values().iterator();
-
- if (!delegatesIterator.hasNext())return null;
-
- return delegatesIterator.next().getId();
- }
-
- /**
- * Retrieves a delegate instance based on the target and delegate IDs.
- *
- * @param targetID
- * the delegating validator's ID.
- * @param delegateID
- * the delegate validator's ID.
- * @return an instance of the delegate validator or null if one cannot be
- * found.
- */
- public IValidator getDelegate(String targetID, String delegateID) throws ValidationException
- {
- ValidatorDelegateDescriptor descriptor = getDescriptor(targetID, delegateID);
-
- if (descriptor == null)return null;
-
- IValidator delegate = descriptor.getValidator();
-
- return delegate;
- }
-
- /**
- * Provides a map with all delegates descriptors for the given target, keyed
- * by their ID.
- *
- * @param targetID
- * the target (delegating) validator id. Must not be null.
- * @return a Map <string, ValidatorDelegateDescriptor>. May be null if the ID
- * passed in is not a delegating validator.
- */
- public Map<String,ValidatorDelegateDescriptor> getDelegateDescriptors(String targetID) {
- return _delegatesByTarget.get(targetID);
- }
-
- /**
- * Finds a delegate descriptor based on the target id and delegate id.
- *
- * @param targetID
- * the delegating validator's id
- * @param delegateID
- * the delegate id
- * @return a ValidatorDelegateDescriptor for the given target and id or null
- * if one cannot be found.
- */
- public ValidatorDelegateDescriptor getDescriptor(String targetID, String delegateID)
- {
- Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
-
- if (delegates == null || delegateID == null)return null;
-
- ValidatorDelegateDescriptor descriptor = (ValidatorDelegateDescriptor) delegates.get(delegateID);
-
- return descriptor;
- }
-
- /**
- * Determines if a given validator has delegates.
- *
- * @param targetID
- * the target validator id.
- * @return true if the target has registered delegates, false otherwise.
- */
- public boolean hasDelegates(String targetID)
- {
- Map<String,ValidatorDelegateDescriptor> delegatesByID = _delegatesByTarget.get(targetID);
-
- boolean hasDelegates = (delegatesByID != null && !delegatesByID.isEmpty());
- return hasDelegates;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
deleted file mode 100644
index 368f267..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class reads the plug-in extension registry and registers each delegating
- * validator descriptor with the delegates registry.
- *
- * @see ValidatorDelegatesRegistry
- */
-class ValidatorDelegatesRegistryReader
-{
- /**
- * The delegate class attribute. Must be visible in the package because it is
- * used by other classes in the package.
- */
- static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
-
- /**
- * The delegate element name.
- */
- private static final String DELEGATE_ELEMENT = "delegate"; //$NON-NLS-1$
-
- /**
- * The validator delegates extension point id.
- */
- private static final String EXTENSION_POINT_ID = "validatorDelegates"; //$NON-NLS-1$
-
- /**
- * The delegate name attribute.
- */
- private static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
- /**
- * Plugin id.
- */
- private static final String PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
-
- /**
- * The target id attribute name.
- */
- private static final String TARGET_ATTRIBUTE = "target"; //$NON-NLS-1$
-
- /**
- * The validator registry where the descriptors being read will be placed.
- */
- private ValidatorDelegatesRegistry registry;
-
- /**
- * Constructor.
- *
- * @param registry
- * the registry where the descriptors being read will be placed.
- */
- public ValidatorDelegatesRegistryReader(ValidatorDelegatesRegistry registry)
- {
- this.registry = registry;
- }
-
- /**
- * Reads a configuration element.
- *
- * @param element
- * the platform configuration element being read.
- */
- private void readElement(IConfigurationElement element)
- {
- String elementName = element.getName();
-
- if (elementName.equals(DELEGATE_ELEMENT))
- {
- String delegateID = element.getAttribute(CLASS_ATTRIBUTE);
- String delegateName = element.getAttribute(NAME_ATTRIBUTE);
- String targetValidatorID = element.getAttribute(TARGET_ATTRIBUTE);
-
- ValidatorDelegateDescriptor descriptor = new ValidatorDelegateDescriptor(delegateID, element, delegateName, targetValidatorID);
-
- registry.add(descriptor);
- }
- }
-
- /**
- * Read from the extensions registry and parse it.
- */
- void readRegistry()
- {
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (IConfigurationElement configurationElement : elements) {
- try {
- readElement(configurationElement);
- }
- catch (Exception e) {
- // we don't want all the validators to be rendered helpless by some
- // rogue contribution, so, we catch any exception that occurs during
- // initialization, log it, and continue on.
- IContributor contributor = configurationElement.getContributor();
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, "Rogue validator delegate from " + contributor);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
deleted file mode 100644
index 66809bc..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
+++ /dev/null
@@ -1,61 +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.operations;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * This operation runs all validators: enabled validators, disabled validators, incremental
- * validators, full validators.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class AllValidatorsOperation extends ValidatorSubsetOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use AllValidatorsOperation(IProject, boolean)
- */
- public AllValidatorsOperation(IProject project) {
- this(project, DEFAULT_ASYNC);
- }
-
- /**
- * Run all configured validators on the project, regardless of whether the validator is enabled
- * or disabled by the user.
- *
- * If async is true, the validation will run all thread-safe validators in a background thread.
- * If async is false, no validators will run in a background thread.
- */
- public AllValidatorsOperation(IProject project, boolean async) {
- super(project, true, async);// always force validation to run
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getValidators()));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null) {
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
deleted file mode 100644
index 39231d4..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.operations;
-
-/**
- * The default line number calculator (always returns "0").
- */
-public class DefaultResourceUtil implements IResourceUtil {
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.IResourceUtil#getLineNo(Object)
- */
- public int getLineNo(Object obj) {
- return 0;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
deleted file mode 100644
index df5a832..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
+++ /dev/null
@@ -1,201 +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.operations;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * Instances of this operation load the project's configured validators, and run the validators if
- * they are both enabled and incremental.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class EnabledIncrementalValidatorsOperation extends EnabledValidatorsOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, boolean)
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta) {
- this(project, delta, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup) {
- this(project, delta, ruleGroup, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
- * instead.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, Set validators, IResourceDelta delta, int ruleGroup) {
- this(project, delta, ruleGroup, DEFAULT_ASYNC);
- setEnabledValidators(validators);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, boolean async) {
- this(project, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IWorkbenchContext context, IResourceDelta delta, boolean async) {
- this(project,context, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project,IWorkbenchContext context, IResourceDelta delta, int ruleGroup, boolean async) {
- super(project, ruleGroup, shouldForce(delta), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- setDelta(delta);
- setContext(context);
- }
-
- /**
- * IProject must exist and be open.
- *
- * If delta is null, a full validation of the project using only the incremental validators is
- * performed. If delta is not null, all enabled incremental validators that validate resources
- * in the delta will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup, boolean async) {
- super(project, ruleGroup, shouldForce(delta), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- setDelta(delta);
- }
-
- /**
- * IProject must exist, be open, and contain all of the resources in changedResources. If some
- * of the resources in changedResources belong to different projects, the result is undefined.
- *
- * If changedResources is null, a full validation of the project using only the incremental
- * validators is performed. If changedResources is not null, all enabled incremental validators
- * that validate resources in the changedResources array will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IWorkbenchContext aWorkbenchContext, IProject project, boolean async) {
- super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- //construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- setContext(aWorkbenchContext);
- }
-
- /**
- * IProject must exist, be open, and contain all of the resources in changedResources. If some
- * of the resources in changedResources belong to different projects, the result is undefined.
- *
- * If changedResources is null, a full validation of the project using only the incremental
- * validators is performed. If changedResources is not null, all enabled incremental validators
- * that validate resources in the changedResources array will validate those resources.
- *
- * If async is true, all thread-safe validators will run in the background validation thread,
- * and all other validators will run in the main thread. If async is false, all validators will
- * run in the main thread.
- */
- public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IProject project, boolean async) {
- super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- if (e.getTargetException() != null)
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
-
- }
- //construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
deleted file mode 100644
index 9b8afb3..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
+++ /dev/null
@@ -1,170 +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.operations;
-
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * Instances of this operation run every enabled validator (both full and incremental) on the
- * project.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class EnabledValidatorsOperation extends ValidatorSubsetOperation {
-
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, boolean)
- */
- public EnabledValidatorsOperation(IProject project) {
- this(project, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
- * boolean, boolean)
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup) {
- this(project, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
- * boolean, boolean)
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force) {
- this(project, ruleGroup, force, DEFAULT_ASYNC);
- }
-
- /**
- * Run all enabled validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, boolean async) {
- this(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- }
-
- /**
- * Run all enabled validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, boolean async) {
- this(project, aWorkbenchContext, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- }
-
- /**
- * Run all enabled validators on the project with the identified ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, int ruleGroup, boolean force, boolean async) {
- this(project, aWorkbenchContext, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
- }
-
-
- /**
- * Run all enabled validators on the project with the identified ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force, boolean async) {
- this(project, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
- }
-
- /**
- * Run the identified validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators, boolean async) {
- this(project, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- // true = force validation to run whether or not auto-validate is on
- }
-
- /**
- * Run the identified validators on the project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project,IWorkbenchContext aWorkbenchContext,
- Set<ValidatorMetaData> enabledValidators, boolean async) {
- this(project,aWorkbenchContext, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
- // true = force validation to run whether or not auto-validate is on
- }
-
- /**
- * Run the identified validators on the project with the ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators,
- int ruleGroup, boolean force, boolean async) {
-
- super(project, force, ruleGroup, async);
- setEnabledValidators(enabledValidators);
- }
-
- /**
- * Run the identified validators on the project with the ruleGroup.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all validators implementing IValidatorJob interface
- * in the background validation thread, if async is false, it would run in the main thread.
- * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
- */
- protected EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext,
- Set<ValidatorMetaData> enabledValidators, int ruleGroup, boolean force, boolean async) {
- super(project,aWorkbenchContext,force, ruleGroup, async);
- setEnabledValidators(enabledValidators);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java
deleted file mode 100644
index 1c2ad11..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java
+++ /dev/null
@@ -1,41 +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.operations;
-
-/**
- * This type represents a group of rules which a validator checks. For now, the only grouping is by
- * speed: if a set of rules can be checked quickly, it will be included in the PASS_FAST group,
- * otherwise, it is grouped in the PASS_FULL group.
- *
- * In future, this could be extended to include severities. To be able to group by severity helps
- * with the MessageLimitException. A validator should report errors first, and then warnings, and
- * then infos, in order to avoid the message limit being reached before the most severe problems are
- * reported.
- */
-public interface IRuleGroup {
- // The following filters are used to identify a group of validation checks.
-
- // retrieves the type of pass, from the IValidationContext, which the validator should execute
- public static final String PASS_LEVEL = "PASS_LEVEL"; //$NON-NLS-1$
-
- // On the FAST_PASS, the validator should check the rules which do not
- // take much time to check, and exclude the rules which are valid only
- // before some action (e.g. exporting or deploying).
- //
- // The severity of the messages is irrelevant.
- public static final int PASS_FAST = 0x1;
- public static final String PASS_FAST_NAME = "fast"; //$NON-NLS-1$ // In plugin.xml, identify this pass by this constant
-
- // On the FULL_PASS, the validator should check everything. This is the default.
- public static final int PASS_FULL = 0x2 | PASS_FAST;
- public static final String PASS_FULL_NAME = "full"; //$NON-NLS-1$ // In plugin.xml, identify this pass by this constant
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
deleted file mode 100644
index 2ee4b60..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
+++ /dev/null
@@ -1,174 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-
-/**
- * In the eclipse environment, not only does the IValidationContext need to be able to load the MOF model, it
- * also needs to load items from the eclipse workbench. This interface should be extended by
- * workbench IHelpers, so that items can be added to, and from, the task list.
- */
-public interface IWorkbenchContext extends IProjectValidationContext {
- /**
- * When the validation is complete, this method will be called so that the IWorkbenchContext can
- * clean up any resources it allocated during the validation.
- *
- * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
- */
- void cleanup(WorkbenchReporter reporter);
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- */
- void closing();
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- */
- void deleting();
-
- /**
- * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
- * Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IFile.
- *
- * @deprecated Implement getResource(Object) instead.
- */
- IFile getFile(Object object);
-
- /**
- * Given an Object, if the object has a corresponding IResource in the workbench, return the
- * IResourcee. Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IResource.
- */
- IResource getResource(Object object);
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents, if possible. If the object is null, or if access to line numbers is not
- * possible, return a text description of the location.
- *
- * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
- * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
- * description of the location must be returned.
- */
- String getLocation(Object object);
-
- /**
- * Return the name of the resource, without the project-specific information in front.
- * <p>
- * This method is used by ValidationOperation to calculate the non-environment specific names of
- * the files. Only the IWorkbenchContext implementation knows how much information to strip off
- * of the IResource name. For example, if there is an EJB Project named "MyEJBProject", and it
- * uses the default names for the source and output folders, "source" and "ejbModule",
- * respectively, then the current implementation of EJB Helper knows how much of that structure
- * is eclipse-specific.
- * </p><p>
- * Since the "source" folder contains Java source files, a portable name would be the
- * fully-qualified name of the Java class, without the eclipse-specific project and folder names
- * in front of the file name. The EJBHelper knows that everything up to the "source" folder, for
- * example, can be removed, because, according to the definition of the EJB Project, everything
- * contained in the source folder is java source code. So if there is an IResource in an EJB
- * Project named "/MyEJBProject/source/com/ibm/myclasses/MyJavaFile.java", this method would
- * make this name portable by stripping off the "/MyEJBProject/source", and returning
- * "com/ibm/myclasses/MyJavaFile.java".
- * </p><p>
- * The output of this method is used by the ValidationOperation, when it is calculating the list
- * of added/changed/deleted file names for incremental validation. If getPortableName(IResource)
- * returns null, that means that the IWorkbenchContext's implementation does not support that
- * particular type of resource, and the resource should not be included in the array of
- * IFileDelta objects in the IValidator's "validate" method.
- * </p>
- */
- String getPortableName(IResource resource);
-
- /**
- * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
- * traverse a certain type of IProject, for example, an EJB project or a web project.
- */
- IProject getProject();
-
- /**
- * When an IValidator associates a target object with an IMessage, the WorkbenchReporter
- * eventually resolves that target object with an IResource. Sometimes more than one target
- * object resolves to the same IResource (usually the IProject, which is the default IResource
- * when an IFile cannot be found). This method is called, by the WorkbenchReporter, so that the
- * WorkbenchReporter can distinguish between the IMessages which are on the same IResource, but
- * refer to different target objects. This is needed for the removeAllMessages(IValidator,
- * Object) method, so that when one target object removes all of its messages, that it doesn't
- * remove another target object's messages.
- *
- * This method may return null only if object is null. Otherwise, an id which can uniquely
- * identify a particular object must be returned. The id needs to be unique only within one
- * particular IValidator.
- */
- String getTargetObjectName(Object object);
-
- /**
- * Whether full or incremental validation is running, this method will be called, by the
- * Validation Framework, for every IResource which is filtered in by the IValidator, so that the
- * IValidationContext can receive notification that one of the resources, which validation will run on, is
- * being filtered in.
- */
- void registerResource(IResource resource);
-
- /**
- * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
- * it can gather information from the current project.
- */
- void setProject(IProject project);
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- */
- void shutdown();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
deleted file mode 100644
index 9b03057..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
+++ /dev/null
@@ -1,63 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.core.Message;
-
-/**
- * This class is provided for validators which run only in UI and whose messages, because they
- * come from another tool, are already localized. LocalizedMessage cannot be used by any validator
- * which needs to run in both WebSphere and WSAD.
- */
-public class LocalizedMessage extends Message {
- private String _message;
-
- public LocalizedMessage(int severity, String messageText) {
- this(severity, messageText, null);
- }
-
- public LocalizedMessage(int severity, String messageText, IResource targetObject) {
- this(severity, messageText, (Object) targetObject);
- }
-
- public LocalizedMessage(int severity, String messageText, Object targetObject) {
- super(null, severity, null);
- setLocalizedMessage(messageText);
- setTargetObject(targetObject);
- }
-
- public void setLocalizedMessage(String message) {
- _message = message;
- }
-
- public String getLocalizedMessage() {
- return _message;
- }
-
- public String getText() {
- return getLocalizedMessage();
- }
-
- public String getText(ClassLoader cl) {
- return getLocalizedMessage();
- }
-
- public String getText(Locale l) {
- return getLocalizedMessage();
- }
-
- public String getText(Locale l, ClassLoader cl) {
- return getLocalizedMessage();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
deleted file mode 100644
index 59d5f0f..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
+++ /dev/null
@@ -1,31 +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.operations;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.FilterUtil;
-
-
-/**
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class ManualIncrementalValidatorsOperation extends ManualValidatorsOperation {
-
- public ManualIncrementalValidatorsOperation(IProject project) {
- super( project );
- }
- public ManualIncrementalValidatorsOperation(IProject project, Object[] changedResources) {
- super( project, changedResources );
- setFileDeltas( FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false) );
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
deleted file mode 100644
index 03a0bf2..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
+++ /dev/null
@@ -1,41 +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.operations;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- * <p>
- * Instances of this operation run every enabled validator (both full and incremental) on the
- * project.
- * </p>
- * <p>
- * This operation is not intended to be subclassed outside of the validation framework.
- * </p>
- */
-public class ManualValidatorsOperation extends ValidatorSubsetOperation {
-
- public ManualValidatorsOperation(IProject project) {
- super(project, DEFAULT_FORCE, RegistryConstants.ATT_RULE_GROUP_DEFAULT, true);
- setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
- }
- public ManualValidatorsOperation(IProject project, Object[] changedResources) {
- super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, true);
- setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
deleted file mode 100644
index 16b93c0..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class MessageInfo {
-
- private String messageOwnerId;
- private IResource resource;
- private String location;
- private String text;
- private String targetObjectName;
- private String markerId;
- private IMessage msg;
-
- public MessageInfo(){
- }
-
- public MessageInfo(String messageOwnerId, IResource resource, String location,
- String text, String targetObjectName, String markerId, IMessage msg){
-
- this.messageOwnerId = messageOwnerId;
- this.resource = resource;
- this.location = location;
- this.text = text;
- this.targetObjectName = targetObjectName;
- this.markerId = markerId;
- this.msg = msg;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getMarkerId() {
- return markerId;
- }
-
- public void setMarkerId(String markerId) {
- this.markerId = markerId;
- }
-
- public String getMessageOwnerId() {
- return messageOwnerId;
- }
-
- public void setMessageOwnerId(String messageOwnerId) {
- this.messageOwnerId = messageOwnerId;
- }
-
- public IMessage getMsg() {
- return msg;
- }
-
- public void setMsg(IMessage msg) {
- this.msg = msg;
- }
-
- public IResource getResource() {
- return resource;
- }
-
- public void setResource(IResource resource) {
- this.resource = resource;
- }
-
- public String getTargetObjectName() {
- return targetObjectName;
- }
-
- public void setTargetObjectName(String targetObjectName) {
- this.targetObjectName = targetObjectName;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- @Override
- public String toString() {
- if (text != null)return "MessageInfo: " + text; //$NON-NLS-1$
- return super.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
deleted file mode 100644
index 99d359b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
+++ /dev/null
@@ -1,125 +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.operations;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Implemented Validators must not be called directly by anyone other than instances of
- * ValidationOperation, because some initialization of the validator, and handling of error
- * conditions, is done in the operation. The initialization is separated because some of the
- * information needed to initialize the validator (i.e., the project) isn't known until runtime.
- *
- * This operation runs a single validator on a project.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class OneValidatorOperation extends ValidatorSubsetOperation {
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
- * boolean, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId) throws IllegalArgumentException {
- this(project, validatorId, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
- * boolean, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force) throws IllegalArgumentException {
- this(project, validatorId, force, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(IProject, String,
- * boolean, int, boolean)
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup) throws IllegalArgumentException {
- this(project, validatorId, force, ruleGroup, DEFAULT_ASYNC);
- }
-
- /**
- * @param validatorId
- * The plugin id of the validator which you wish to run.
- * @param force
- * If the value is "true", the validator should be run regardless of what the
- * environment settings are; if the value is "false", this operation should be run
- * only if the validation builder will not run the validator.
- *
- * IllegalArgumentException will be thrown if the named validator is not configured on the
- * project.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, boolean async) throws IllegalArgumentException {
- this(project, validatorId, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * OneValidatorOperation constructor comment.
- *
- * @param project
- * The project to be validated. It must exist and be open.
- * @param validatorId
- * The plug-in id of the validator which you wish to run.
- * @param force
- * If the value is "true", the validator should be run regardless
- * of what the environment settings are; if the value is "false",
- * this operation should be run only if the validation builder
- * will not run the validator.
- * @param ruleGroup
- * Whether a FULL or FAST pass should be invoked.
- * @param async
- * If async is true, the validation will run all thread-safe
- * validators in the background validation thread, and all other
- * validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- *
- * IllegalArgumentException will be thrown if the named validator is not
- * configured on the project.
- *
- */
- public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup, boolean async) throws IllegalArgumentException {
- super(project, force, ruleGroup, async);
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- if (vmd == null) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(validatorId);
- }
-
- if (!vmd.isConfiguredOnProject(project)) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(validatorId);
- }
-
- Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
- enabled.add(vmd);
- setEnabledValidators(enabled);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
deleted file mode 100644
index c15609c..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
+++ /dev/null
@@ -1,35 +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
- *******************************************************************************/
-/*
- * Created on May 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * @author vijayb
- */
-public interface ReferencialFileValidator {
-
- /**
- * Answer the referenced files.
- *
- * @param inputFiles
- * @return a list of IFile's.
- */
- public List<IFile> getReferencedFile(List inputFiles);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
deleted file mode 100644
index 99d66e1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.validation.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorHelper {
- public ReferencialFileValidatorHelper() {
- }
-
- /**
- * Return a list of all files contained in project to infinite depth
- */
- public static List<IFile> getAllProjectFiles(IProject project) {
- List<IFile> result = new ArrayList<IFile>();
- if (project == null)return result;
-
- try {
- result = collectFiles(project.members(), result);
- } catch (CoreException e) {
- //Ignore
- }
- return result;
- }
-
- private static List<IFile> collectFiles(IResource[] members, List<IFile> result) throws CoreException {
- // recursively collect files for the given members
- for (IResource res : members) {
- if (res instanceof IFolder)collectFiles(((IFolder) res).members(), result);
- else if (res instanceof IFile)result.add((IFile)res);
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
deleted file mode 100644
index 8e942ea..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
+++ /dev/null
@@ -1,20 +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.operations;
-
-
-/**
- * @deprecated For use by the validation framework only. This class retrieves the Strings from the
- * .properties file appropriate for the machine's Locale.
- */
-public final class ResourceHandler extends org.eclipse.wst.validation.internal.ResourceHandler {
- //Default
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
deleted file mode 100644
index 8532dc1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-
-
-
-/**
- * @deprecated This class is intended to be used only by the validation framework. The
- * TaskListHelper class will be removed in Milestone 4.
- */
-public class TaskListHelper {
- private static TaskListHelper _taskListHelper = null;
-
- public static TaskListHelper getTaskList() {
- if (_taskListHelper == null) {
- _taskListHelper = new TaskListHelper();
- }
- return _taskListHelper;
- }
-
- /**
- * This method adds a message to a resource in the task list.
- */
- public void addTask(String pluginId, IResource resource, String location, String messageId, String message, int markerType, String targetObjectName, String groupName, int offset, int length) throws CoreException {
- TaskListUtility.addTask(pluginId, resource, location, messageId, message, markerType, targetObjectName, groupName, offset, length);
- }
-
-
- public IMarker[] getValidationTasks(int severity, IProject project) {
- return TaskListUtility.getValidationTasks(severity, project);
- }
-
- public IMarker[] getValidationTasks(IResource resource, int severity) {
- return TaskListUtility.getValidationTasks(resource, severity);
- }
-
- public IMarker[] getValidationTasks(IResource resource, String messageOwner) {
- return TaskListUtility.getValidationTasks(resource, messageOwner);
- }
-
- public IMarker[] getValidationTasks(IResource resource, String[] messageOwners) {
- return TaskListUtility.getValidationTasks(resource, messageOwners);
- }
-
- /**
- * Remove all validation messages from the resource and its children.
- */
- public void removeAllTasks(IResource resource) {
- TaskListUtility.removeAllTasks(resource);
- }
-
- /**
- * This method removes all tasks from the resource. If the resource is an IProject, all tasks
- * are also removed from the project's children.
- */
- public void removeAllTasks(IResource resource, String[] owners) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owners);
- }
-
- /**
- * This method removes all messages from a resource in the task list.
- */
- public void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owner, objectName);
- }
-
- public void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
- TaskListUtility.removeAllTasks(resource, owners, objectName);
- }
-
- /**
- * This method removes a subset of tasks from the project, including child tasks. Every task
- * which belongs to the group, identified by groupName, will be removed.
- */
- public void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
- TaskListUtility.removeTaskSubset(resource, owners, objectName, groupName);
- }
-
- /**
- * This method changes all validator markers which are owned by "from" to make their owner "to".
- */
- public void updateOwner(String from, String to) throws CoreException {
- TaskListUtility.updateOwner(from, to);
- }
-
- /**
- * This method changes all validator markers on the IResource and its children. All markers
- * owned by "from" have their owner reassigned to "to".
- */
- public void updateOwner(String from, String to, IResource resource) throws CoreException {
- TaskListUtility.updateOwner(from, to, resource);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
deleted file mode 100644
index 5bb1c28..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
+++ /dev/null
@@ -1,303 +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.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValBuilderJob;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Validation Framework Builder.
- * <p>
- * This builder is configured on J2EE IProjects automatically, and can be added to other types of
- * projects through the Properties page. It launches validation on the project if the project has
- * build validation enabled.
- * </p>
- * <p>
- * This launches a Job for the new V2 validators and also a Job for each of the Job based V1
- * validators. If there are any "in-line" V1 validations they are done as part of this builder.
- * Because of all the jobs that this builder spawns, the build will usually be finished long before
- * all the validation has finished.
- * </p>
- */
-public class ValidationBuilder extends IncrementalProjectBuilder {
- /*
- * GRK - This class serves as a main entry point into the framework. There is one instance of this class for every
- * project that has a validation builder configured for it. Typically if you had ten projects in your workspace you would have
- * ten of these objects. They are created early in the life cycle of the workbench, and then are reused.
- *
- * My observation was that they are run serially by the same thread.
- */
- public static final int NO_DELTA_CHANGE = -1;
- protected List<IProject> referencedProjects;
- protected IWorkbenchContext workbenchContext = null;
-
- /**
- * All the jobs that the validation framework spawns will belong to this family.
- */
- public static final Object FAMILY_VALIDATION_JOB = new Object();
-
- public ValidationBuilder() {
- }
-
- private IProject[] getAllReferencedProjects(IProject project, Set<IProject> visitedProjects) {
- if (visitedProjects == null)visitedProjects = new HashSet<IProject>();
- else if (visitedProjects.contains(project))return getReferencedProjects();
- else visitedProjects.add(project);
-
- if (referencedProjects == null)referencedProjects = new ArrayList<IProject>();
- try {
- if (project.isAccessible()) {
- IProject[] refProjArray = project.getReferencedProjects();
- collectReferecedProject(refProjArray);
- for (IProject refProject : refProjArray) {
- getAllReferencedProjects(refProject, visitedProjects);
- }
- }
- return getReferencedProjects();
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return null;
- }
-
- public IWorkbenchContext getWorkbenchContext() {
- if(workbenchContext == null) {
- workbenchContext = new WorkbenchContext();
- workbenchContext.setProject(getProject());
- }
- return workbenchContext;
- }
-
- /**
- * Add the projects from refProjArray to the list of referenced projects (if they are not
- * already in the list).
- * @param refProjArray
- */
- private void collectReferecedProject(IProject[] refProjArray) {
- for (IProject project : refProjArray) {
- if (!referencedProjects.contains(project))referencedProjects.add(project);
- }
- }
-
- protected void clean(IProgressMonitor monitor) throws CoreException {
- IProject currentProject = getProject();
- Tracing.log("ValidationBuilder-02 clean ", currentProject); //$NON-NLS-1$
-
- newClean(monitor);
- if (currentProject == null || !currentProject.isAccessible())return;
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(currentProject);
- ValidatorMetaData[] vmds = prjp.getValidators();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- // For validators who aren't going to run, clear their messages from the task list.
- // Don't need to check for duplicate entries because each Validator must be unique.
- // The uniqueness of each Validator is checked by the plugin registry.
- WorkbenchReporter.removeAllMessages(currentProject, vmd.getValidatorNames(), null);
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
-
- }
-
- private IProject[] getReferencedProjects() {
- IProject[] refProjArray = new IProject[referencedProjects.size()];
- return referencedProjects.toArray(refProjArray);
- }
-
- @SuppressWarnings("unchecked")
- public IProject[] build(int kind, Map parameters, IProgressMonitor monitor) {
- IResourceDelta delta = null;
- IProject project = getProject();
- Tracing.log("ValidationBuilder-01 build ", kind, project); //$NON-NLS-1$
- if (Tracing.isLogging(1)){
- Tracing.logResourceDeltas(getDelta(project), 50);
- }
-
- // GRK I wonder why this builder needs to know about all the other referenced projects?
- // won't they have builders of their own.
- IProject[] referenced = getAllReferencedProjects(project, null);
- if (ValidationFramework.getDefault().isSuspended(project) ||
- ValManager.getDefault().isDisabled(project))return referenced;
-
- try {
- newBuild(kind, monitor);
-
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- delta = getDelta(project);
- boolean doFullBuild = (kind == FULL_BUILD);
-
- // It is possible for kind to == AUTO_BUILD while delta is null
- // (saw this when creating a project by copying another project.)
- // However, a "Rebuild Project" will invoke this builder with
- // kind==FULL_BUILD and a null delta, and validation should run in that case.
- if (!doFullBuild && delta == null) {
- if (isReferencedProjectInDelta(referenced)) {
- performFullBuildForReferencedProjectChanged(monitor, prjp);
- } else {
- String[] msgParms = new String[]{project.getName()};
- monitor.subTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_NULL_DELTA, msgParms));
- // A null delta means that a full build must be performed,
- // but this builder was invoked with an incremental or automatic
- // build kind. Return without doing anything so that the user
- // doesn't have to wait forever.
- }
- return referenced;
- }
- if (doFullBuild) {
- cleanupReferencedProjectsMarkers(prjp, referenced);
- performFullBuild(monitor, prjp);
- } else {
- if (delta.getAffectedChildren().length == 0) {
- if (isReferencedProjectInDelta(referenced)){
- cleanupReferencedProjectsMarkers(prjp, referenced);
- performFullBuildForReferencedProjectChanged(monitor, prjp);
- }
- return referenced;
- }
- EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, true);
- operation.run(monitor);
- }
- return referenced;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return referenced;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return referenced;
- } finally {
- referencedProjects = null;
- }
- }
-
- private void cleanupReferencedProjectsMarkers(final ProjectConfiguration prjp, IProject[] referenced){
- //When a project references one or more project, performing a clean build on referenced
- //causes delta to be invoked on referencee, aka, parent. This causes following code to
- //be invoked.
- //The following code is trying to fix a case where Ejb project references a utility project,
- //and the clean build on utility project causes the code to come here, the ejb validator runs
- //on the ejb project due to performFullBuildForReferencedProjectChanged() below, but it also
- //causes marker to be generated for the util project, but the markers for util project are not
- //cleaned up.
-
- if( referenced == null || referenced.length == 0 )return;
-
- try{
- ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, false);
-
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>();
- set.addAll( Arrays.asList( enabledValidators ) );
- for (IProject p : referenced) {
- if (!p.isAccessible())continue;
- ProjectConfiguration refProjectCfg = ConfigurationManager.getManager().getProjectConfiguration(p);
-
- ValidatorMetaData[] refEnabledValidators = refProjectCfg.getEnabledFullBuildValidators(true, false);
-
- //remove from the set the validators which are also in child
- for(ValidatorMetaData vmd : refEnabledValidators)set.remove(vmd);
-
- for(ValidatorMetaData vmd : set)WorkbenchReporter.removeAllMessages(p, vmd.getValidator());
- }
- }catch (Exception exc) {
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, exc.toString());
- }
-}
-
- private boolean isReferencedProjectInDelta(IProject[] referenced) {
- IProject p = null;
- for (int i = 0; i < referenced.length; i++) {
- p = referenced[i];
- IResourceDelta delta = getDelta(p);
- if (delta != null && delta.getAffectedChildren().length > 0)
- return true;
- }
- return false;
- }
-
- private void performFullBuildForReferencedProjectChanged(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException {
- performFullBuild(monitor, prjp, true);
- }
-
- private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException {
- performFullBuild(monitor, prjp, false);
- }
-
- private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp, boolean onlyDependentValidators) throws InvocationTargetException {
- ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, onlyDependentValidators);
- if ((enabledValidators != null) && (enabledValidators.length > 0)) {
- Set<ValidatorMetaData> enabledValidatorsSet = InternalValidatorManager.wrapInSet(enabledValidators);
- EnabledValidatorsOperation op = new EnabledValidatorsOperation(getProject(), enabledValidatorsSet, true);
- op.run(monitor);
- }
- }
-
- /**
- * Run the new validation builder. This is a transition method, while we continue to have
- * the old and new validation builders.
- *
- * @param kind the kind of build
- *
- * @see IncrementalProjectBuilder#AUTO_BUILD
- * @see IncrementalProjectBuilder#CLEAN_BUILD
- * @see IncrementalProjectBuilder#FULL_BUILD
- * @see IncrementalProjectBuilder#INCREMENTAL_BUILD
- */
- private void newBuild(int kind, IProgressMonitor monitor) throws CoreException {
-
- IResourceDelta delta = null;
- IProject project = getProject();
-
- switch (kind){
- case AUTO_BUILD:
- case INCREMENTAL_BUILD:
- delta = getDelta(project);
- break;
- }
-
- ValBuilderJob.validateProject(project, delta, kind);
- }
-
-
- /**
- * Run the new clean method. This is a transition method, while we continue to have
- * the old and new validation builders.
- */
- private void newClean(IProgressMonitor monitor) throws CoreException {
- ValManager.getDefault().clean(getProject(), monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
deleted file mode 100644
index 260fa72..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
+++ /dev/null
@@ -1,25 +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.operations;
-
-
-import org.eclipse.wst.validation.internal.ResourceConstants;
-
-/**
- * @deprecated For use by the validation framework only.
- *
- * Constants used to access the string resources associated with the plugin.
- *
- * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
- */
-public interface ValidationConstants extends ResourceConstants {
- //Default
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
deleted file mode 100644
index c9f7b53..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
+++ /dev/null
@@ -1,1460 +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.internal.operations;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-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.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-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.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ReferencialFileValidatorRegistryReader;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
-import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * Validators must not be called directly by anyone other than this class, since
- * some initialization of the validator is done here (via the getProject() method). The
- * initialization is separated because the IProject isn't known until runtime.
- * <p>
- * This operation is not intended to be subclassed outside of the validation framework.
- * </p>
- */
-public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadlessRunnableWithProgress {
- // Since IResourceConstants don't have a "no delta" flag, let this constant be the flag.
- public static final int NO_DELTA_CHANGE = -1;
- private static final String DELTA_AS_STRING = "IFileDelta[{0}] '{'{1}'}'"; //$NON-NLS-1$
- private static final String COMMA = ", "; //$NON-NLS-1$
-
- // For the depreciated constructors, by default the operation will not fork.
- protected static final boolean DEFAULT_ASYNC = true;
-
- protected static final boolean DEFAULT_FORCE = true;
-
- private static ValidationLauncherJob launcherJob = new ValidationLauncherJob();
-
- private static final int jobsPerProcessor = 3;
-
- private final static class ValidationLauncherJob extends Job {
- private Queue<Job> _validationJobs = new LinkedList<Job>();
-
- public ValidationLauncherJob() {
- super(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_VALIDATION_JOB_MSG));
- setSystem(true);
- setRule(ResourcesPlugin.getWorkspace().getRoot());
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- int processors = Runtime.getRuntime().availableProcessors();
- int totalInitialJobs = processors * jobsPerProcessor;
- synchronized (_validationJobs) {
- // never schedule more than 3 validation jobs per processor at a time
- for (int i=0; i< totalInitialJobs; i++) {
- Job validationJob = _validationJobs.poll();
- if (validationJob == null) break;
- addJobChangeAdapter(validationJob);
- validationJob.schedule();
- }
- }
- return Status.OK_STATUS;
- }
-
- private void addJobChangeAdapter(Job job) {
- job.addJobChangeListener(new JobChangeAdapter(){
- // when done, see if there is another validation job to schedule
- public void done(IJobChangeEvent event) {
- synchronized (_validationJobs) {
- Job validationJob = _validationJobs.poll();
- if (validationJob != null) {
- addJobChangeAdapter(validationJob);
- validationJob.schedule();
- }
- }
- }
- });
- }
-
- @Override
- public boolean belongsTo(Object family) {
- if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
- if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
- return true;
- }
- return super.belongsTo(family);
- }
-
- public void addValidationJob(Job validationJob) {
- synchronized (_validationJobs) {
- _validationJobs.add(validationJob);
- // schedule the job if we were empty
- if (_validationJobs.size() == 1) {
- this.schedule();
- }
- }
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use DEFAULT_ASYNC
- */
- protected static final boolean DEFAULT_FORK = false; // @deprecated
- private IProject _project; // project to be validated
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- private boolean _fork = DEFAULT_ASYNC; // do not fork the validation into a
- // different thread by default
- private Map<ValidatorMetaData, Set<IFileDelta>> _fileDeltas; // To reduce object creation,
- private IResourceDelta _delta;
-
- // the resource delta tree to be processed, or null if a full build/menu
- // option was triggered. This value is cached so that validation can be run
- // either from a builder, or from a menu item. (The Operation interface
- // doesn't allow any parameter on execute except the IProgressMonitor.)
- private Set<ValidatorMetaData> _enabledValidators;
-
- private boolean _force = DEFAULT_FORCE; // force this operation to run even if it doesn't need to?
- private boolean _isFullValidate; // Run a full validation or an incremental? (true = full)
- private Boolean _isAutoBuild; // Is the global auto-build preference enabled?
- private Set<ValidatorMetaData> _launchedValidators;
-
- protected IWorkbenchContext context;
-
- // are enabled and were launched (i.e., that have input to validate). For internal
- // validation framework use only;
- // it's needed for the automatic tests.
- /**
- * This method is used for FINEST logging, to report exactly what deltas were about to be
- * validated.
- */
- private static final String getDeltaAsString(IFileDelta[] delta) {
- String args = ""; //$NON-NLS-1$
- int numArgs = 0;
- if (delta != null) {
- numArgs = delta.length;
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < delta.length; i++) {
- buffer.append(COMMA);
- buffer.append(delta[i].toString());
- }
- buffer.replace(0, 1, ""); //$NON-NLS-1$ // magic numbers 0 and 1 => Remove first COMMA from the list (hence index 0); length of COMMA is 2, hence index 0, 1.
- args = buffer.toString();
- }
- return MessageFormat.format(DELTA_AS_STRING, new Object[]{String.valueOf(numArgs), args});
- }
-
- protected static void checkCanceled(WorkbenchReporter reporter) throws OperationCanceledException {
- if (reporter == null)return;
- else if (reporter.getProgressMonitor().isCanceled()) {
- throw new OperationCanceledException(""); //$NON-NLS-1$
- }
- }
-
- protected static boolean shouldForce(IResourceDelta delta) {
- return ((delta == null) ? DEFAULT_FORCE : false);
- }
-
- protected static boolean shouldForce(Object[] changedResources) {
- return (((changedResources == null) || (changedResources.length == 0)) ? DEFAULT_FORCE : false);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, boolean)
- */
- public ValidationOperation(IProject project) {
- this(project, DEFAULT_ASYNC, DEFAULT_FORCE);
- }
-
- /**
- * Internal.
- */
- public ValidationOperation(IProject project, boolean force, boolean async) {
- this(project, null, null, RegistryConstants.ATT_RULE_GROUP_DEFAULT, force, async);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, int, boolean)
- */
- public ValidationOperation(IProject project, int ruleGroup) {
- this(project, null, null, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
- }
-
- /**
- * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(IProject,
- * IResourceDelta, Boolean, int, boolean, boolean)
- */
- public ValidationOperation(IProject project, IResourceDelta delta, boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- this(project, delta, ((isAutoBuild) ? Boolean.TRUE : Boolean.FALSE), ruleGroup, fork, force);
- }
-
- /**
- * Internal.
- */
- protected ValidationOperation(IProject project, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- super();
- _project = project;
- _delta = delta;
- _isAutoBuild = isAutoBuild;
- _ruleGroup = ruleGroup;
- _fork = fork;
- _force = force;
- _enabledValidators = new HashSet<ValidatorMetaData>();
- }
-
- /**
- * Internal.
- */
- protected ValidationOperation(IProject project, IWorkbenchContext aContext, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
- super();
- _project = project;
- _delta = delta;
- _isAutoBuild = isAutoBuild;
- _ruleGroup = ruleGroup;
- _fork = fork;
- _force = force;
- _enabledValidators = new HashSet<ValidatorMetaData>();
- context = aContext;
- }
-
- /**
- * @deprecated Will be removed in Milestone 3.
- */
- protected void terminateCleanup(WorkbenchReporter reporter) {
- for (ValidatorMetaData vmd : getEnabledValidators()) {
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- try {
- reporter.removeAllMessages(vmd.getValidator());
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- }
- }
-
-
- /**
- * @param vmd
- * @param delta
- * @param logger
- * @param start
- */
-// private void logValidationInfo(ValidatorMetaData vmd, IFileDelta[] delta, Logger logger, long start) {
-// long finish = System.currentTimeMillis();
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName(vmd.getValidatorUniqueName());
-// entry.setElapsedTime(finish - start);
-// if (logger.isLoggingLevel(Level.FINE)) {
-// StringBuffer buffer = new StringBuffer();
-// if (isFullValidate()) {
-// buffer.append("EVERYTHING"); //$NON-NLS-1$
-// } else {
-// if (delta.length == 0) {
-// buffer.append("NOTHING"); //$NON-NLS-1$
-// } else {
-// buffer.append(getDeltaAsString(delta));
-// }
-// }
-// entry.setDetails(buffer.toString());
-// }
-// logger.write(Level.INFO, entry);
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleThrowables(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
-// // If a runtime exception has occured, e.g. NullPointer or ClassCast,
-// // display it with the "A runtime exception has occurred " messsage.
-// // This will provide more information to the user when he/she calls IBM
-// // Service.
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
-// Message message = ValidationPlugin.getMessage();
-// message.setSeverity(IMessage.NORMAL_SEVERITY);
-// message.setId(ResourceConstants.VBF_EXC_RUNTIME);
-// message.setParams(msgParm);
-// try {
-// reporter.addMessage(vmd.getValidator(), message);
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// } catch (MessageLimitException e) {
-// throw e;
-// }
-// return;
-// }
-
- /**
- * @param vmd
- * @param logger
- * @param exc2
- */
-// private void handleInstantiationException(ValidatorMetaData vmd, Logger logger, InstantiationException exc2) {
-// // Remove the vmd from the reader's list
-// ValidationRegistryReader.getReader().disableValidator(vmd);
-// // Log the reason for the disabled validator
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator (deprecated)"); //$NON-NLS-1$
-// entry.setTargetException(exc2);
-// logger.write(Level.SEVERE, entry);
-// }
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleValidationExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, ValidationException exc) {
-// // First, see if a validator just caught all Throwables and
-// // accidentally wrapped a MessageLimitException instead of propagating
-// // it.
-// if (exc.getAssociatedException() != null) {
-// if (exc.getAssociatedException() instanceof MessageLimitException) {
-// MessageLimitException mssgExc = (MessageLimitException) exc.getAssociatedException();
-// throw mssgExc;
-// } else if (exc.getAssociatedException() instanceof ValidationException) {
-// try {
-// ValidationException vexc = (ValidationException) exc.getAssociatedException();
-// vexc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
-// // set the class loader,so that the exception's getMessage() method can retrieve
-// // the resource bundle
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// }
-// }
-// // If there is a problem with this particular validator, log the error
-// // and continue
-// // with the next validator.
-// try {
-// exc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
-// // set the class loader,so that the exception's getMessage() method can retrieve the
-// // resource bundle
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation.validate(WorkbenchMonitor)"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// if (exc.getAssociatedException() != null) {
-// entry.setTargetException(exc.getAssociatedException());
-// logger.write(Level.SEVERE, entry);
-// }
-// }
-// String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
-// reporter.displaySubtask(message);
-// if (exc.getAssociatedMessage() != null) {
-// try {
-// reporter.addMessage(vmd.getValidator(), exc.getAssociatedMessage());
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// }
-// }
-// }
-
- /**
- * @param reporter
- * @param vmd
- * @param logger
- * @param exc
- */
-// private void handleHelperCleanupExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
-// // If a runtime exception has occured, e.g. NullPointer or ClassCast,
-// // display it with the "A runtime exception has occurred " messsage.
-// // This will provide more information to the user when he/she calls IBM
-// // Service.
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
-// Message message = ValidationPlugin.getMessage();
-// message.setSeverity(IMessage.NORMAL_SEVERITY);
-// message.setId(ResourceConstants.VBF_EXC_RUNTIME);
-// message.setParams(msgParm);
-// try {
-// reporter.addMessage(vmd.getValidator(), message);
-// } catch (InstantiationException exc2) {
-// handleInstantiationException(vmd, logger, exc2);
-// } catch (MessageLimitException e) {
-// throw e;
-// }
-// return;
-// }
-
- public boolean isFork() {
- return _fork;
- }
-
- public boolean isForce() {
- return _force;
- }
-
- public void setForce(boolean force) {
- _force = force;
- }
-
- /**
- * If the code that invoked this operation suspended auto-build before invoking this operation,
- * the user's auto-build setting is stored in the following methods.
- */
- public boolean isAutoBuild() {
- if (_isAutoBuild == null) {
- return ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- }
- return _isAutoBuild.booleanValue();
- }
-
- protected void setAutoBuild(boolean autoOn) {
- _isAutoBuild = ((autoOn) ? Boolean.TRUE : Boolean.FALSE);
- }
-
- protected boolean isFullValidate() {
- return _isFullValidate;
- }
-
- private void setFullValidate(boolean b) {
- _isFullValidate = b;
- }
-
- protected int getRuleGroup() {
- return _ruleGroup;
- }
-
- /**
- * Return true if the given validator must run (i.e., it has changes to validate, and it was not
- * run automatically.)
- */
- private boolean isValidationNecessary(ValidatorMetaData vmd, IFileDelta[] delta) {
- // Validation is not necessary if there are no files for the validator to validate.
- return isFullValidate() || (delta.length > 0);
- }
-
- /**
- * Return true if, given the enabled validators and file deltas, there is work for this
- * operation to do.
- */
- public boolean isNecessary(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
- Set<ValidatorMetaData> enabledValidators = getEnabledValidators();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return false;
- }
- if (isFullValidate())return true;
-
- for (ValidatorMetaData vmd : enabledValidators) {
- if (isValidationNecessary(vmd, getFileDeltas(monitor, vmd)))return true;
- }
- return false;
- }
-
- private Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(IProgressMonitor monitor) throws CoreException {
- if (_fileDeltas == null)loadFileDeltas(monitor);
- return _fileDeltas;
- }
-
- private IFileDelta[] getFileDeltas(IProgressMonitor monitor, ValidatorMetaData vmd) throws CoreException {
- Set<IFileDelta> result = getFileDeltas(monitor).get(vmd);
- if (result == null)return new IFileDelta[0];
-
- IFileDelta[] temp = new IFileDelta[result.size()];
- result.toArray(temp);
- return temp;
- }
-
- /**
- * Store the file deltas (VMD <=>Set[IFileDelta]) if the file deltas haven't been loaded. If the
- * deltas have already been loaded, return without doing anything.
- */
- private void loadFileDeltas(IProgressMonitor monitor) throws CoreException {
- // Although, for a full build, we don't build up a list of changed
- // files, we do need to notify each IWorkbenchContext that an
- // IResource has been filtered in.
- // It's a full validation if the IResourceDelta is null and the
- // Object[] (or IResource[]) is also null.
- // i.e., it's a full validation if no incremental input has been set.
- setFullValidate((getDelta() == null) && (_fileDeltas == null));
- if (isFullValidate()) {
- _fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getProject());
- } else {
- _fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getDelta()); // traverse,
- // and process, each resource in the delta tree
- }
- }
-
- protected void setFileDeltas(Map<ValidatorMetaData, Set<IFileDelta>> deltas) {
- _fileDeltas = deltas;
- }
-
- protected IResourceDelta getDelta() {
- return _delta;
- }
-
- protected void setDelta(IResourceDelta delta) {
- _delta = delta;
- }
-
- protected boolean areValidatorsEnabled() {
- return (getEnabledValidators().size() != 0);
- }
-
- /**
- * Return the validators which are both configured on this type of project, (as stored in
- * getProject()), and enabled by the user on this project.
- */
- public Set<ValidatorMetaData> getEnabledValidators() {
- return _enabledValidators;
- }
-
- /**
- * This is an internal method, subject to change without notice. It is provided only for the
- * automated validation framework tests.
- */
- public Set<ValidatorMetaData> getLaunchedValidators() {
- if (_launchedValidators == null) {
- _launchedValidators = new HashSet<ValidatorMetaData>();
- }
- return _launchedValidators;
- }
-
- protected void setEnabledValidators(Set<ValidatorMetaData> evmds) {
- // Check that every VMD in the set is configured on this project.
- // Necessary because the user can manually choose which validators
- // to launch, and the validator may not be installed.
- _enabledValidators.clear();
- for (ValidatorMetaData vmd : evmds) {
- if (ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, getProject())) {
- _enabledValidators.add(vmd);
- }
- }
- }
-
- /**
- * This method returns the IProject that this ValidationOperation was created with.
- */
- public IProject getProject() {
- return _project;
- }
-
- protected int getUnitsOfWork() {
- /*
- * Let one unit of work equal one resource. number of enabled validators. i.e., each
- * enabled validator must process (at most) each resource in the project; count each process
- * as one unit of work. Note that this is a ceiling number, because if we're doing an
- * incremental validation, not all resources will be validated.
- * setNumResources(countResources(getProject())); getEnabledValidators().size();
- */
- // Until the validators can report units-of-work complete,
- // initialize the monitor with an unknown amount of work.
- // (So the user will see movement in the progress bar, even
- // if the movement doesn't indicate the amount of work done.)
- return IProgressMonitor.UNKNOWN;
- }
-
- /**
- * If the user is cancelling validation on the current project/resource, Add an information task
- * to the task list informing the user that validation has not been run on the current project.
- */
- protected void addCancelTask(ValidatorMetaData vmd) {
- InternalValidatorManager.getManager().addOperationTask(getProject(), vmd, ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- }
-
- /**
- * This method starts the validation of each configured enabled validator on the current
- * project.
- *
- * The IProgressMonitor passed in must not be null.
- */
- public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
- try {
- // In order to check whether or not the monitor has been canceled, the monitor must not be null.
- if (progressMonitor == null)return;
- IProject project = getProject();
- if (ValidationFramework.getDefault().isSuspended(project))return;
- if (ValManager.getDefault().isDisabled(project))return;
-
- if (!areValidatorsEnabled()) {
- // save some processing time...
- return;
- }
-
- final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor);
-
- try {
- // Periodically check if the user has canceled the operation
- checkCanceled(reporter);
- preValidate(reporter);
- validate(reporter);
- validateReferencialFiles(reporter);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- } finally {
- //TODO GRK determine if timing info should be added here
-// if (logger.isLoggingLevel(Level.FINE)) {
-// long finish = System.currentTimeMillis();
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.run(WorkbenchMonitor)"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName("ValidationOperation"); //$NON-NLS-1$
-// entry.setElapsedTime(finish - start);
-// logger.write(Level.FINE, entry);
-// }
- }
- }
-
- private void validateReferencialFiles(WorkbenchReporter reporter) {
- ReferencialFileValidatorRegistryReader reader = ReferencialFileValidatorRegistryReader.getInstance();
- if (reader != null) {
- reader.readRegistry();
- ReferencialFileValidator refFileValidator = reader.getReferencialFileValidator();
- if (refFileValidator != null) {
- if (_delta != null) {
- refFileValidateFileDelta(reporter, refFileValidator);
- } else if (_project != null) {
- postValidateProject(reporter, refFileValidator);
- }
- }
- }
- }
-
- private void refFileValidateFileDelta(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- IResourceDelta[] resourceDelta = _delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
- List<IResource> inputFiles = new ArrayList<IResource>();
-
- List<IFile> referencingFiles = new ArrayList<IFile>();
- if (resourceDelta != null && resourceDelta.length > 0) {
- for (int i = 0; i < resourceDelta.length; i++) {
- IResource resource = resourceDelta[i].getResource();
- if (resource instanceof IFolder) {
- getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
- } else if (resource instanceof IFile)
- inputFiles.add(resource);
- }
- List<IFile> rFilesToValidate = refFileValidator.getReferencedFile(inputFiles);
- if (rFilesToValidate != null && !rFilesToValidate.isEmpty())
- referencingFiles.addAll(rFilesToValidate);
- try {
- if (!referencingFiles.isEmpty())
- validateReferencingFiles(reporter, referencingFiles);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- private void getFileResourceDeltaInFolder(IResourceDelta delta, List<IResource> inputFiles) {
- IResourceDelta[] resourceDelta = delta.getAffectedChildren();
- for (int i = 0; i < resourceDelta.length; i++) {
- IResource resource = resourceDelta[i].getResource();
- if (resource instanceof IFile)inputFiles.add(resource);
- else if (resource instanceof IFolder)getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
- }
- }
-
- private void postValidateProject(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(_project);
- for (ValidatorMetaData data : set) {
- List<String> filters = data.getNameFilters();
- List<IFile> files = getAllFilesForFilter(filters);
- if (!files.isEmpty()) {
- List<IFile> fileForValidation = refFileValidator.getReferencedFile(files);
- try {
- validateReferencingFiles(reporter, fileForValidation);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
-
- private List<IFile> getAllFilesForFilter(List<String> filters) {
- if (!filters.isEmpty()) {
- List<IFile> allProjectFiles = ReferencialFileValidatorHelper.getAllProjectFiles(_project);
- List<IFile> filterFiles = new ArrayList<IFile>();
- for (String fileName : filters) {
- if (fileName == null)continue;
-
- for (IFile projectFile : allProjectFiles) {
- if (fileName.charAt(0) == '*') {
- String extName = fileName.substring(2, fileName.length());
- String ext = projectFile.getFileExtension();
- if (ext != null && ext.equals(extName))filterFiles.add(projectFile);
- } else if (fileName.equals(projectFile.getName()))filterFiles.add(projectFile);
- }
- }
- return filterFiles;
- }
- return new LinkedList<IFile>();
- }
-
- private void validateReferencingFiles(IReporter reporter, List<IFile> referencingFiles) throws Exception {
- Set<IFile> validatedFiles = new HashSet<IFile>();
- for (IFile refFile : referencingFiles) {
- if (!validatedFiles.contains(refFile)) {
- IResource resource = refFile.getParent();
- IProject project = null;
- if (resource != null && !(resource instanceof IProject))
- project = getProjectContainer(resource);
- else
- project = (IProject) resource;
- if (project != null) {
- Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(project);
- for (ValidatorMetaData data : set) {
- if (data.isApplicableTo(refFile)) {
- IValidator validator = data.getValidator();
- validator.validate(data.getHelper(project),reporter);
- validatedFiles.add(refFile);
- }
- }
- }
- }
- }
- }
-
- private IProject getProjectContainer(IResource resource) {
- IResource pResource = resource.getParent();
- if (!(pResource instanceof IProject))
- return getProjectContainer(pResource);
- return (IProject) pResource;
- }
-
- protected void preValidate(WorkbenchReporter reporter) throws CoreException, OperationCanceledException {
- // Load the input.
- getFileDeltas(reporter.getProgressMonitor());
- }
-
- /**
- * Iterate over all of the enabled validators and run the thread-safe validators in a background
- * thread, and the not-thread-safe validators in this thread.
- */
- protected void validate(WorkbenchReporter reporter) throws OperationCanceledException {
- if (reporter == null)return;
- checkCanceled(reporter);
- reporter.getProgressMonitor().beginTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_PROGRESSMONITOR_TITLE), getUnitsOfWork());
- IValidator validator = null;
- Iterator<ValidatorMetaData> iterator = null;
- IFileDelta[] delta = null;
-
- Set<ValidatorMetaData> jobValidators = new HashSet<ValidatorMetaData>();
- Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>();
-
- for(ValidatorMetaData vmd : getEnabledValidators()){
- IValidator valInstance = null;
- try {
- valInstance = vmd.getValidator();
- }
- catch (InstantiationException e1) {
- if(!ValidatorManager.getManager().getProblemValidators().contains(vmd)) {
- ValidatorManager.getManager().getProblemValidators().add(vmd);
- System.out.println(e1.getMessage());
- }
- }
-
- if( isFork() && (valInstance != null) && valInstance instanceof IValidatorJob ){
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if( willRun )jobValidators.add( vmd );
- }
- else if (valInstance != null){
- validators.add( vmd );
- }
- }
- if( jobValidators.size() > 0 ){
- launchJobs( jobValidators, reporter );
- }
-
- ValidatorMetaData currentVmd = null;
- try {
- for (ValidatorMetaData vmd : validators) {
- currentVmd = vmd;
- // Is validation about to be run on this validator?
- // Validation will run either if this operation forces regardless
- // of need, or if the validator was not run automatically.
- // If validation is not about to be run, then don't activate
- // the plug-in
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (Tracing.isTraceV1()) {
- StringBuffer buffer = new StringBuffer();
- buffer.append("ValidationOperation-01: will run? "); //$NON-NLS-1$
- buffer.append(willRun);
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("is force? "); //$NON-NLS-1$
- buffer.append(isForce());
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isAutoBuild? "); //$NON-NLS-1$
- buffer.append(_isAutoBuild);
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isAutoValidate? "); //$NON-NLS-1$
- buffer.append(" "); //$NON-NLS-1$
- buffer.append("isIncremental? "); //$NON-NLS-1$
- buffer.append(vmd.isIncremental());
- buffer.append(" "); //$NON-NLS-1$
- if (isFullValidate()) {
- buffer.append("EVERYTHING"); //$NON-NLS-1$
- } else {
- if (delta.length == 0) {
- buffer.append("NOTHING"); //$NON-NLS-1$
- } else {
- buffer.append(getDeltaAsString(delta));
- }
- }
- Tracing.log(buffer);
- }
- if (!willRun) {
- continue;
- }
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- continue;
- }
- try {
- context = vmd.getHelper(getProject());
- initValidateContext(delta);
- validator = vmd.getValidator();
-
- checkCanceled(reporter);
-
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
-// if (isFork() && vmd.isAsync()) {
-// // Don't appear to run in the foreground by sending
-// // progress to the IProgressMonitor in the
-// // WorkbenchMonitor. Suppress the status messages by
-// // changing the IProgressMonitor to a
-// // NullProgressMonitor.
-// VThreadManager.getManager().queue(wrapInRunnable(nullReporter, validator, vmd,(WorkbenchContext)getContext(),delta, iterator));
-// } else {
-// internalValidate(reporter, validator, vmd, context, delta);
-// }
- internalValidate(reporter, validator, vmd, context, delta);
- }
- }
- catch (OperationCanceledException exc) {
- handleOperationCancelledValidateException(reporter, validator, currentVmd, iterator, exc);
- }
- finally {
- releaseCachedMaps();
- }
- }
-
- private void releaseCachedMaps() {
- ValidationRegistryReader.getReader().clearCachedMaps();
- IProjectValidationHelper helper = ValidationHelperRegistryReader.getInstance().getValidationHelper();
- if (helper != null)
- helper.disposeInstance();
- }
-
- private void initValidateContext(IFileDelta[] delta) {
- if (context instanceof WorkbenchContext) {
- ((WorkbenchContext)context).setValidationFileURIs(new ArrayList<String>());
- for(IFileDelta file : delta) {
- if(file.getDeltaType() != IFileDelta.DELETED ) {
- ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
- }
- }
- }
- }
-
- /**
- * @param reporter
- * @param validator
- * @param vmd
- * @param iterator
- * @param logger
- * @param exc
- */
- private void handleOperationCancelledValidateException(WorkbenchReporter reporter, IValidator validator,
- ValidatorMetaData vmd, Iterator<ValidatorMetaData> iterator, OperationCanceledException exc) {
- /*
- * If the user terminates validation (i.e., presses "cancel" on the progress monitor) before
- * the validation completes, perform clean up on each configured enabled validator.
- *
- * To clean up, several steps are performed: 1. call <code></code> on each configured
- * enabled validator, so that each validator can perform cleanup that it knows is necessary.
- * 2. remove all tasks that this validator has added to the task list 3. add another task to
- * the task list to say that validation, using this validator on this project, was
- * terminated.
- *
- * Steps 2 and 3 are done so that it's clear what has, and has not, been validated. If these
- * steps weren't performed, validation could be done on some items in the project, but not
- * others; and the user could mistakenly believe that those are the only problems with the
- * project. Unless the user knows that a full verification needs to be done, he/she could
- * continue to rely on automatic verification, and never know that there are problems with a
- * resource which hasn't been validated.
- */
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- reporter.removeAllMessages(validator);
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- while (iterator.hasNext()) {
- vmd = (ValidatorMetaData) iterator.next();
- try {
- validator = vmd.getValidator();
- } catch (InstantiationException exc2) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(exc2);
- continue;
- }
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- reporter.removeAllMessages(validator);
- addCancelTask(vmd);
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
- }
- throw exc; // propagate the exception up to the framework so that
- // the framework can display the correct "canceled"
- // message in the dialog
-
- }
-
- /* package */
- void internalValidate(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd,final IWorkbenchContext aContext, final IFileDelta[] delta) throws OperationCanceledException {
- try {
- checkCanceled(reporter);
- removeOldMessages(reporter, validator, vmd, delta);
- // Do NOT check if the message limit is exceeded before launching
- // the validator.
- // Even if the limit is exceeded when the messages are removed from
- // the delta
- // files, it could be that the validator itself will remove
- // messages before
- // proceeding. Let the validator run so that it can remove messages
- // if it
- // needs to, and if it tries to add a message when the limit is
- // exceeded, let
- // the WorkbenchReporter take care of it.
- launchValidator(reporter, validator, vmd, aContext, delta);
- } catch (OperationCanceledException exc) {
- // This is handled in the validate(WorkbenchReporter) method.
- throw exc;
- }catch (Exception e) {
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- // If a runtime exception has occurred, e.g. NullPointer or
- // ClassCast, display it with the "A runtime exception has occurred" message.
- // This will provide more information to the user when he/she calls Service.
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
-
- /*
- The code below causes bundle not found exception since, the bundle here is
- validate_base and we are trying to load that bundle from the classloader of
- the Validator.
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
- */
- } finally {
- // If user fixes problem, and limit exceeded, add "exceeded"
- // message, or
- // if limit not exceeded any more, remove "exceeded" message.
- //Message Limit is removed from the framework
- //ValidatorManager.getManager().checkMessageLimit(getProject(), true);
- reporter.getProgressMonitor().done();
- }
- }
-
- /**
- * In order to allow validators to run, must first check if there's space for new markers. But
- * the old markers must not prevent validation from running again (limit exceeded), so delete
- * all of the old markers first, and then run validation.
- */
- private final void removeOldMessages(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IFileDelta[] delta) {
- if (reporter == null) {
- return;
- }
- // If the validator has been enabled, remove the "cancel" task.
- // If the validator, on the last run, threw a Throwable, remove the
- // "internal error" task. (For the same reasons we remove the "cancel"
- // task.
- InternalValidatorManager.getManager().removeOperationTasks(getProject(), vmd);
- checkCanceled(reporter);
- try {
- // Check to see if a full build must be performed, or if a delta
- // build is to be performed, if there are files to verify for that
- // validator. (If it's delta, but there are no files, calling
- // validate on that validator starts a full build, instead of just
- // returning.)
- if (isFullValidate()) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
- reporter.displaySubtask(message);
- reporter.removeAllMessages(validator);
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- } else {
- // Don't need to check that there are deltas to validate
- // because that's already checked in isValidationNecessary
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
- reporter.displaySubtask(message);
- for (int i = 0; i < delta.length; i++) {
- WorkbenchFileDelta fd = (WorkbenchFileDelta) delta[i];
- if (fd.getDeltaType() != IFileDelta.DELETED) {
- // If the file has been deleted, eclipse erases all
- // markers on the file.
- // Also, when a resource doesn't exist,
- // WorkbenchReporter's getMessageResource()
- // returns the IProject, which means that removing the
- // messages from this
- // file removes all of this validator's messages on
- // this IProject (aix defect 206157)
- IResource resource = reporter.getMessageResource(validator, fd);
- if (fd.getObject().equals(fd.getResource())) {
- WorkbenchReporter.removeAllMessages(resource, validator); // remove
- } else {
- reporter.removeAllMessages(validator, fd.getObject());
- }
- }
- }
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- }
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- return;
- }
- }
-
- /**
- * Whether a full verification or a delta verification is in progress, both will call this
- * method to process the resource. This method calls the current Validator to filter the
- * resource (i.e., this method returns if the resource fails the filter test).
- * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
- * the current Validator to validate the resource.
- *
- * <p>To process a resource, there are several steps:</p>
- * <p>1. check if the resource is registered for
- * this validator (i.e., the validator has either specified it in a filter, or has not filtered
- * it out explicitly)</p>
- *
- * <p>2. call <code>isValidationSource</code> on the current validator with
- * the current resource. This method performs further filtering by the Validator itself, in
- * addition to the static filtering done by the framework, based on the information in
- * plugin.xml.</p>
- *
- * <p>3. If the resource passes both filters, call <code>validate</code> on the
- * validator, with the resource.</p>
- *
- * <p>4. When complete (either by failing to pass a filter, or by the
- * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
- * (i.e., one resource has been processed.)</p>
- */
- private final void launchValidator(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
- if (reporter == null)return;
- checkCanceled(reporter);
- // Check to see if a full build must be performed, or if a delta
- // build is to be performed, if there are files to verify for that
- // validator. (If it's delta, but there are no files, calling
- // validate on that validator starts a full build, instead of just
- // returning.)
- try {
- // Validate the resource; this step will add errors/warnings to the
- // task list, and remove errors/warnings from the task list.
- if (helper instanceof WorkbenchContext) {
- // Initialize the "loadRuleGroup" method with the group of rules
- // which the validator should validate.
- ((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
- }
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_STARTING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- if (Tracing.isLogging()) {
- // This internal "launched validators" value is used only in tests.
- getLaunchedValidators().add(vmd);
- }
- //initValidateContext(delta);
- ValidatorLauncher.getLauncher().start(helper, validator, reporter);
- //TODO GRK determine if timing info should be added here
-// if (logger.isLoggingLevel(Level.INFO)) {
-// TimeEntry entry = ValidationPlugin.getTimeEntry();
-// entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
-// entry.setProjectName(getProject().getName());
-// entry.setToolName(vmd.getValidatorUniqueName());
-// entry.setElapsedTime(finish - start);
-// if (logger.isLoggingLevel(Level.FINE)) {
-// StringBuffer buffer = new StringBuffer();
-// if (isFullValidate()) {
-// buffer.append("EVERYTHING"); //$NON-NLS-1$
-// } else {
-// if (delta.length == 0) {
-// buffer.append("NOTHING"); //$NON-NLS-1$
-// } else {
-// buffer.append(getDeltaAsString(delta));
-// }
-// }
-// entry.setDetails(buffer.toString());
-// }
-// logger.write(Level.INFO, entry);
-// }
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (ValidationException exc) {
- // First, see if a validator just caught all Throwables and
- // accidentally wrapped a MessageLimitException instead of
- // propagating it.
- if (exc.getAssociatedException() != null) {
- if (exc.getAssociatedException() instanceof ValidationException) {
- ValidationException vexc = (ValidationException) exc.getAssociatedException();
- vexc.setClassLoader(validator.getClass().getClassLoader()); // first,
- // set the class loader, so that the exception's getMessage() method
- // can retrieve the resource bundle
- }
- }
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- exc.setClassLoader(validator.getClass().getClassLoader()); // first,
- ValidationPlugin.getPlugin().handleException(exc);
- ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- if (exc.getAssociatedMessage() != null) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
-
- /*
- The code below causes bundle not found exception since, the bundle here is
- validate_base and we are trying to load that bundle from the classloader of
- the Validator.
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
- */
-
- } finally {
- try {
- validator.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
- try {
- helper.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return;
- } finally {
- // Now that cleanup has been called, set the project to null.
- // This project's
- // resources have been freed so this project should also be
- // cleared on the helper.
- // If it isn't set to null, then the next time that the helper
- // is retrieved from
- // the ValidatorMetaData, the resources allocated for this
- // project, in the
- // helper's initialize method, will not be reallocated if the
- // project is the same.
- helper.setProject(null);
- }
- // Tell the progress monitor that we've completed n units of work
- // (i.e., n resources validated by one validator).
- reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length));
- }
- }
-
-// private Runnable wrapInRunnable(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd, final IWorkbenchContext helper, final IFileDelta[] delta, final Iterator iterator) {
-// // Need to create a new Runnable each time because several Runnable
-// // instances may exist at the same time.
-// Runnable runnable = new ProjectRunnable(reporter, validator, vmd, helper, delta, iterator);
-// return runnable;
-// }
-
- /*
- * // For convenience, keep this method in the class but commented out. // When async needs to
- * be tested, this method may be needed again. private static void debug(String prefix,
- * IWorkbenchContext helper) { IProject hProject = helper.getProject(); System.err.println(prefix +
- * "Start ValidationOperation "+Thread.currentThread().getName() + "::" + hProject.getName());
- * if( Thread.currentThread().getName().equals("ValidationThread") &&
- * (hProject.getName().indexOf("noFork") > -1)) { Thread.dumpStack(); } else
- * if((!Thread.currentThread().getName().equals("ValidationThread")) &&
- * (hProject.getName().indexOf("fork") > -1)) { Thread.dumpStack(); } System.err.println(prefix +
- * "End ValidationOperation"); }
- */
-
- /**
- * @deprecated This class is no longer used by the framework.
- */
- public class ProjectRunnable implements Runnable {
- private WorkbenchReporter _reporter;
- private IValidator _validator;
- private ValidatorMetaData _vmd;
- private IFileDelta[] _delta;
-
- @SuppressWarnings("unchecked")
- public ProjectRunnable(WorkbenchReporter reporter, IValidator validator,
- ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta, Iterator iterator) {
- _reporter = reporter;
- _validator = validator;
- _vmd = vmd;
- _delta = delta;
- }
-
- public void run() {
- try {
- internalValidate(_reporter, _validator, _vmd, context,_delta);
- } catch (OperationCanceledException exc) {
- // User can't cancel a job in a background thread, so ignore this exception.
- }
- }
-
- public IProject getProject() {
- return _reporter.getProject();
- }
- }
-
- /**
- * @return Returns the context.
- */
- public IValidationContext getContext() {
- return context;
- }
-
- /**
- * @param context The context to set.
- */
- public void setContext(IWorkbenchContext context) {
- this.context = context;
- }
-
- void launchJobs(Set<ValidatorMetaData> validators, final WorkbenchReporter reporter) throws OperationCanceledException{
-
- IValidator validator = null;
- IFileDelta[] delta = null;
- IWorkbenchContext workbenchcontext = null;
-
- for (ValidatorMetaData vmd : validators) {
- checkCanceled(reporter);
-
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (!willRun)continue;
-
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- continue;
- }
-
- try {
- validator = vmd.createValidator();
- workbenchcontext = vmd.createHelper( getProject() );
- initValidateContext( delta, workbenchcontext );
- vmd.addHelper((IValidatorJob)validator, workbenchcontext);
- checkCanceled(reporter);
-
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- continue;
- }
-
- try {
- checkCanceled(reporter);
- removeOldMessages(reporter, validator, vmd, delta);
-
- if( validator instanceof IValidatorJob ){
- launchValidatorJob( reporter, (IValidatorJob)validator, vmd, workbenchcontext, delta);
- }
-
-
- } catch (OperationCanceledException exc) {
- throw exc;
-
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- } catch (Error e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(mssg);
- throw e;
- } finally {
- // If user fixes problem, and limit exceeded, add "exceeded"
- // message, or if limit not exceeded any more, remove "exceeded" message.
- reporter.getProgressMonitor().done();
- }
- }
- }
-
- private void initValidateContext(IFileDelta[] delta, IWorkbenchContext context ) {
- if (context instanceof WorkbenchContext) {
- ((WorkbenchContext)context).setValidationFileURIs(new ArrayList<String>());
- for(IFileDelta file : delta) {
- if(file.getDeltaType() != IFileDelta.DELETED ) {
- ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
- }
- }
- }
- }
-
- private final void launchValidatorJob(WorkbenchReporter reporter,
- IValidatorJob validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
-
- if (reporter == null)return;
- checkCanceled(reporter);
-
- if (helper instanceof WorkbenchContext) {
- ((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
- }
- if (Tracing.isLogging()) {
- // This internal "launched validators" value is used only in tests.
- getLaunchedValidators().add(vmd);
- }
-
- ValidatorJob validatorjob = new ValidatorJob( validator, vmd.getValidatorDisplayName(),
- vmd.getValidatorUniqueName(), helper.getProject(), helper );
-
- ISchedulingRule schedulingRule = validator.getSchedulingRule(helper);
- validatorjob.setRule( schedulingRule );
- QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
- validatorjob.setProperty( validatorKey, validator );
- validatorjob.addJobChangeListener(
- new JobChangeAdapter(){
-
- public void done(IJobChangeEvent event){
- Job job = event.getJob();
- QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
- IValidatorJob validator = (IValidatorJob)job.getProperty( validatorKey );
- ValidatorManager mgr = ValidatorManager.getManager();
- final List<MessageInfo> list = mgr.getMessages(validator);
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
-
- for(MessageInfo info : list){
- try {
- TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
- info.getLocation(), info.getMsg().getId(), info.getText(),
- info.getMsg().getSeverity(),
- info.getMarkerId(),
- info.getTargetObjectName(),
- info.getMsg().getGroupName(),
- info.getMsg().getOffset(),
- info.getMsg().getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- };
- try {
-
- ResourcesPlugin.getWorkspace().run(runnable, null, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- mgr.clearMessages( validator );
- validator = null;
- }
- }
- );
- validatorjob.setPriority(Job.DECORATE);
- launcherJob.addValidationJob(validatorjob);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
deleted file mode 100644
index 4e53471..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
+++ /dev/null
@@ -1,102 +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.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class contains utility methods that are intended to be used by validators and code outside
- * of the validation framework.
- */
-public final class ValidationUtility {
- //TODO Make the ValidationUtility constructor private in Milestone 4.
-
- /**
- * Given an IResource and one of the org.eclipse.wst.validation.internal.core.core.SevertyEnum constants,
- * return an array containing the fully-qualified class names of the validators which have
- * reported messages, of the given severity, against the resource and the resource's children.
- */
- public static String[] listValidatorClasses(IResource resource, int severity) {
- IMarker[] markers = TaskListUtility.getValidationTasks(resource, severity);
- if ((markers == null) || (markers.length == 0)) {
- return new String[0];
- }
-
- Set<String> tempSet = new HashSet<String>();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- try {
- Object owner = marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_OWNER);
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- continue;
- }
- tempSet.add((String)owner);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
-
- if (tempSet.size() > 0) {
- String[] result = new String[tempSet.size()];
- tempSet.toArray(result);
- tempSet.clear();
- return result;
- }
- return new String[0];
- }
-
- /**
- * @deprecated This instance method will be made static in Milestone 4.
- */
- public boolean isEnabled(IProject project, String validatorClassName) {
- return isEnabled(project, new String[]{validatorClassName});
- }
-
- /**
- * Return true if all of the validators, identified by their fully-qualified class names, are
- * enabled on the project. If a validator isn't enabled, or if there's an internal error while
- * retrieving the user's configuration, return false.
- */
- public static boolean isEnabled(IProject project, String[] validatorClassNames) {
- if ((validatorClassNames == null) || (validatorClassNames.length == 0)) {
- return false;
- }
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- for (int i = 0; i < validatorClassNames.length; i++) {
- if (!prjp.isEnabled(validatorClassNames[i])) {
- return false;
- }
- }
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
-
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
deleted file mode 100644
index 048dd39..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-public class ValidatorJob extends Job {
-
-
- private IProject project;
- private IWorkbenchContext helper;
- private IValidatorJob validator;
-
- public ValidatorJob(String name) {
- super(name);
- }
-
- public ValidatorJob( IValidatorJob validator, String displayName, String name, IProject project, IWorkbenchContext aHelper ){
- super(displayName);
- this.project = project;
- this.helper = aHelper;
- this.validator = validator;
- }
-
- //revisit reporter in the code below
- //subtask information is displayed in the monitor created by the Job
- //error information is reported by the IReporter
-
- protected IStatus run(IProgressMonitor monitor) {
-
- IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
- long elapsed = -1;
- long cpuTime = -1;
- if (pm.isCollecting()){
- elapsed = System.currentTimeMillis();
- cpuTime = Misc.getCPUTime();
- }
-
- monitor.beginTask("Validating", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
- IStatus status = IValidatorJob.OK_STATUS;
- WorkbenchReporter reporter = new WorkbenchReporter( project, monitor );
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
-
- try {
-
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_STARTING_VALIDATION,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
-
- monitor.subTask(message);
- status = validator.validateInJob(helper, reporter);
-
- message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
- monitor.subTask(message);
-
- } catch (OperationCanceledException exc) {
- throw exc;
- } catch (ValidationException exc) {
- // First, see if a validator just caught all Throwables and
- // accidentally wrapped a MessageLimitException instead of
- // propagating it.
- if (exc.getAssociatedException() != null) {
- if (exc.getAssociatedException() instanceof ValidationException) {
- ValidationException vexc = (ValidationException) exc.getAssociatedException();
- vexc.setClassLoader(validator.getClass().getClassLoader());
- }
- }
- // If there is a problem with this particular validator, log the
- // error and continue with the next validator.
- exc.setClassLoader(validator.getClass().getClassLoader());
-
- ValidationPlugin.getPlugin().handleException(exc);
- ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
- String message = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
-
- monitor.subTask(message);
- if (exc.getAssociatedMessage() != null) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- String mssg = ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
- new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName() });
-
- monitor.subTask(mssg);
-
- } finally {
- try {
- validator.cleanup(reporter);
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
-
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- status = WTPCommonPlugin.createErrorStatus(message.getText());
- return status;
- } finally {
- try {
- helper.cleanup(reporter);
- vmd.removeHelper( validator );
- }catch (OperationCanceledException e) {
- throw e;
- } catch (Exception exc) {
- ValidationPlugin.getPlugin().handleException(exc);
- String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
- Message message = ValidationPlugin.getMessage();
- message.setSeverity(IMessage.NORMAL_SEVERITY);
- message.setId(ResourceConstants.VBF_EXC_RUNTIME);
- message.setParams(msgParm);
- reporter.addMessage(validator, message);
-
- status = WTPCommonPlugin.createErrorStatus(message.getText());
- return status;
- } finally {
- helper.setProject(null);
- vmd.removeHelper( validator );
- helper = null;
- reporter = null;
- }
- }
- //reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length)); // One
- //monitor.worked(((delta == null) ? 1 : delta.length)); // One
- monitor.done();
- }
- if (pm.isCollecting()){
- if (cpuTime != -1){
- cpuTime = Misc.getCPUTime() - cpuTime;
- }
- String projectName = null;
- if (project != null)projectName = project.getName();
- pm.add(new PerformanceCounters(vmd.getValidatorUniqueName(),
- vmd.getValidatorDisplayName(),projectName, -1,
- System.currentTimeMillis()-elapsed, cpuTime));
- }
- return status;
- }
-
- public boolean belongsTo(Object family) {
- return (project.getName() + ValidatorManager.VALIDATOR_JOB_FAMILY).equals(family);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
deleted file mode 100644
index 7cf398b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
+++ /dev/null
@@ -1,1001 +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.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * A centralized class for accessing validation metadata.
- *
- * This class is not intended to be subclassed outside of the validation framework.
- */
-public final class ValidatorManager {
- public static final String VALIDATOR_JOB_FAMILY = "validators"; //$NON-NLS-1$
- private static ValidatorManager inst;
- private static IResourceUtil _resourceUtil; // a common utility, different whether or not
- // WSAD is running in headless or UI mode, which can retrieve the line number of some MOF objects.
- private static final Class RESOURCEUTIL_DEFAULTCLASS = org.eclipse.wst.validation.internal.operations.DefaultResourceUtil.class;
- private static Class _resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;
-
- // an empty set, provided for convenience, so that we only construct one empty set once.
- private static final Set<ValidatorMetaData> EMPTY_SET = new HashSet<ValidatorMetaData>();
-
- private static Class _messageLimitOwner;
- private String[] _internalOwners;
- private Map<IValidatorJob, List<MessageInfo>> _validatorMsgs =
- Collections.synchronizedMap( new HashMap<IValidatorJob, List<MessageInfo>>() );
- private Set<ValidatorMetaData> _problemValidators = new HashSet<ValidatorMetaData>();
-
- private ValidatorManager() {
- super();
- _internalOwners = new String[0];
-
- addInternalOwner(getMessageLimitOwner());
- }
-
- /**
- * Disable all validators for the current project, and does not touch the auto-validate setting.
- */
- public void disableAllValidators(IProject currentProject, IProgressMonitor monitor) {
- // Disable the individual validators
- setEnabledValidators(currentProject, EMPTY_SET, monitor);
- }
-
- public void enableValidator(String validatorId) {
-
- try {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- gf.enableSingleValidator(vmd);
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
-
- public void disableValidator(String validatorId){
-
- try {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- gf.disableSingleValidator(vmd);
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
-
- public void enableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(true);
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
-
- if(manualValidation)prjp.enableSingleManualValidator(vmd);
- if (buildValidation)prjp.enableSingleBuildValidator(vmd);
- prjp.store();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
- public void disableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation){
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(true);
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
-
- if(manualValidation)prjp.disableSingleManualValidator(vmd);
- if (buildValidation)prjp.disableSingleBuildValidator(vmd);
- prjp.store();
-
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- }
-
-
-
- /**
- * Given an IProject, if the IProject does not support build validation, add the validation
- * builder to the project description so that the project can support build validation.
- */
- public static void addProjectBuildValidationSupport(IProject project) {
- /*
- * I'm working my way through the code to see where this gets called. One place was in ModuleCoreNature
- * which had hard coded the builder id.
- */
- if (project == null)return;
-
- boolean isBuilderAdded = false;
- try {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- if (commands != null) {
- for (ICommand command : commands) {
- String builderName = command.getBuilderName();
- if (builderName == null) {
- // builder name will be null if it has not been set
- continue;
- }
-
- if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
- isBuilderAdded = true;
- break;
- }
- }
- }
-
- if (!isBuilderAdded) {
- ICommand newCommand = description.newCommand();
- newCommand.setBuilderName(ValidationPlugin.VALIDATION_BUILDER_ID);
-
- ICommand[] newCommands = null;
- if (commands != null) {
- newCommands = new ICommand[commands.length + 1];
- System.arraycopy(commands, 0, newCommands, 0, commands.length);
- newCommands[commands.length] = newCommand;
- } else {
- newCommands = new ICommand[1];
- newCommands[0] = newCommand;
- }
- description.setBuildSpec(newCommands);
-
- project.setDescription(description, null);
- }
- } catch (CoreException exc) {
- // if we can't read the information, the project isn't open, so it can't run
- // auto-validate
- return;
- }
- }
-
-
- /**
- * Given an IProject, this method returns true if the project can run build validation (i.e.,
- * incremental validation), and false otherwise. The test, to find out if the project supports
- * build validation or not, is to see if the ValidationBuilder is configured on that type of
- * project.
- * <p>
- * This is a long-running process - is there any way that I can shorten the amount of time this
- * takes?
- */
- public static boolean doesProjectSupportBuildValidation(IProject project) {
- boolean canRunAV = false;
- if (project == null) {
- return canRunAV;
- }
-
- try {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec(); // don't need to check if description
- // is null, because it's never null
- if (commands == null) {
- return canRunAV;
- }
-
- for (int i = 0; i < commands.length; i++) {
- String builderName = commands[i].getBuilderName();
- if (builderName == null) {
- // builder name will be null if it has not been set
- continue;
- }
-
- if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
- canRunAV = true;
- break;
- }
- }
- } catch (CoreException exc) {
- // if we can't read the information, the project isn't open, so it can't run
- // auto-validate
- return false;
- }
-
- return canRunAV;
- }
-
- /**
- * Enable all validators for the current project, and does not touch the auto-validate setting.
- */
- public void enableAllValidators(IProject project, IProgressMonitor monitor) {
- // Turn auto-validate off
- // setAutoValidate(currentProject, false);
-
- // Enable the individual validators
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setEnabledValidators(prjp.getValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of incremental ValidatorMetaData configured on a certain type of IProject
- * (e.g. EJB Project vs. Web Project).
- */
- public Set getProjectConfiguredIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getIncrementalValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData configured on a certain type of IProject (e.g. EJB
- * Project vs. Web Project).
- *
- * If the collection has not been calculated before, calculate it now, and cache the result.
- */
- public Set getProjectConfiguredValidatorMetaData(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getValidators());
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
- * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
- * incremental, or non-incremental, validators which should be returned. If the parameter is
- * true, return incremental validators. If the parameter is false, return nonincremental
- * validators.
- */
- public Set getProjectEnabledIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
- * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
- * incremental, or non-incremental, validators which should be returned. If the parameter is
- * true, return incremental validators. If the parameter is false, return nonincremental
- * validators.
- */
- public Collection getProjectEnabledNonIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(false));
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Returns a Vector of all ValidatorMetaData who are both configured on this type of project,
- * and who are also enabled by this project. If the list of enabled validators hasn't been
- * loaded into the cache, load it now. Otherwise, just return it.
- */
- public Set getProjectEnabledValidators(IProject project) {
- return getEnabledValidators(project);
- }
-
- public static ValidatorManager getManager() {
- if (inst == null) {
- inst = new ValidatorManager();
- }
- return inst;
- }
-
- public static IResourceUtil getResourceUtil() {
- if (_resourceUtil == null) {
- if (_resourceUtilClass == null) {
- // Since the value returned from this method must never be null,
- // default the resource util to the headless resource util.
- _resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;
- }
-
- try {
- _resourceUtil = (IResourceUtil) _resourceUtilClass.newInstance();
- } catch (ClassCastException e) {
- _resourceUtil = null;
- } catch (InstantiationException e) {
- _resourceUtil = null;
- } catch (IllegalAccessException e) {
- _resourceUtil = null;
- }
- }
- return _resourceUtil;
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(int severity, IProject project) {
- return getValidationTasks(project, severity);
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(IResource resource, int severity) {
- return TaskListUtility.getValidationTasks(resource, severity);
- }
-
- /**
- * @deprecated This method is intended for use only by the validation framework. It will be
- * moved to a class in the "internal" package at some time.
- */
- public IMarker[] getValidationTasks(IResource resource, String[] validatorNames) {
- return TaskListUtility.getValidationTasks(resource, validatorNames);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public ValidatorMetaData getValidatorMetaData(IValidator validator) {
- return ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public Set<ValidatorMetaData> getIncrementalValidators(Collection vmds) {
- if (vmds == null)return new HashSet<ValidatorMetaData>();
-
- Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
- Iterator iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- if (vmd.isIncremental()) {
- result.add(vmd);
- }
- }
- return result;
- }
-
-
- /**
- * Return true if the validator identified by validatorId will validate the given resource. If
- * either parameter is null, false is returned. If the validator is not registered with the
- * validation framework (i.e., either no validator in the activated plugins is identified by
- * that plugin id, or the given IResource's project does not run that particular validator),
- * then this method will return false.
- */
- public boolean isApplicableTo(String validatorId, IResource res) {
- if ((validatorId == null) || (res == null)) {
- return false;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- if (vmd == null) {
- // validator not registered with the framework
- return false;
- }
-
- if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, res.getProject())) {
- return false;
- }
-
- return vmd.isApplicableTo(res);
- }
-
-
- public boolean isAutoValidate(IProject project) {
- return isAutoValidate(project, isGlobalAutoBuildEnabled());
- }
-
- /**
- * Keeping this API around so as not to break existing code.
- *
- * @deprecated use isAutoValidate
- */
- public boolean isAutoValidateChecked(IProject project) {
- return isAutoValidate(project);
- }
-
- /**
- * Keeping this API around so as not to break existing code.
- *
- * @deprecated use isAutoValidate
- */
- public boolean isAutoValidateChecked(IProject project, boolean isGlobalAutoBuildOn) {
- return isAutoValidate(project, isGlobalAutoBuildOn);
- }
-
- /**
- * This method returns true if validate will run when there is a resource change. The following
- * attributes are checked: 1. does this project have auto-validate on or off? 2. if this project
- * does not have an auto-validate value set, is the global auto-validate preference on? 3. if 1
- * or 2 is true, does the project support auto-validate? 4. if 1/2, & 3, is auto-build on? 5. if
- * 1/2, 3, and 4, is there at least one incremental validator enabled on the project?
- *
- * @deprecated auto validate is not used any more
- */
- public boolean isAutoValidate(IProject project, boolean isGlobalAutoBuildOn) {
- /*try {
- // 1. does the project have auto-validate on or off?
- boolean isAutoValidate = ConfigurationManager.getManager().getProjectConfiguration(project).isAutoValidate();
- if (!isAutoValidate) {
- return false;
- }
-
- // 3. does the project support auto-validate?
- // 4. is auto-build on?
- // 5. is there at least one incremental validator enabled on the project?
-
- * Auto-validation, on the properties page, can be enabled under these conditions: 1.
- * the project supports auto-validation, AND 2. fhe platform's global "automatically
- * build" is selected, AND 3. at least one of the project's validators supports
- * incremental validation. Without #1, the ValidationBuilder is never called because
- * it's not configured on the project. Without #2, the ValidationBuilder will not be
- * called because auto-building is turned off. Without #3, the ValidationBuilder will be
- * called, but there's no point because no validators can run.
-
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn);
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.canAutoValidateButtonBeEnabled(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
-
- // If the user's setting can't be retrieved, return the default
- return ValidationConfiguration.getAutoValidateDefault();
- }*/
- return false;
- }
-
- public boolean canAutoValidateButtonBeEnabled(IProject project) {
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildEnabled());
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public Set getEnabledIncrementalValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getEnabledIncrementalValidators(true);
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Given a checked list of enabled validators, return a set of the ones which are configured on
- * the project and, if getIncremental is true, which also run incrementally.
- */
- public Set<ValidatorMetaData> getProjectConfiguredValidators(IProject project, Object[] enabledVal,
- boolean getIncremental) {
- if ((project == null) || (enabledVal == null) || (enabledVal.length == 0)) {
- return new HashSet<ValidatorMetaData>();
- }
-
- Set<ValidatorMetaData> val = new HashSet<ValidatorMetaData>();
- for (int i = 0; i < enabledVal.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
- if (!vmd.isConfiguredOnProject(project))continue;
-
- if (!getIncremental || vmd.isIncremental())val.add(vmd);
- }
- return val;
- }
-
- public boolean containsIncrementalValidators(Object[] enabledVal) {
- if ((enabledVal == null) || (enabledVal.length == 0)) {
- return false;
- }
-
- for (int i = 0; i < enabledVal.length; i++) {
- ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
-
- if (vmd.isIncremental()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * For use by the validation framework only.
- */
- protected Set<ValidatorMetaData> getEnabledValidators(IProject project) {
- try {
- ValidatorMetaData[] vmds = null;
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if(!prjp.useGlobalPreference())
- vmds = prjp.getEnabledValidators();
- else
- vmds = getStateOfProjectLevelValidatorsFromGlobal(prjp);
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- private ValidatorMetaData[] getStateOfProjectLevelValidatorsFromGlobal(ProjectConfiguration prjp) throws InvocationTargetException {
- List<ValidatorMetaData> enabledGlobalValidatorsForProject = new ArrayList<ValidatorMetaData>();
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- List allProjectValidator = getAllValidatorUniqueNames(prjp.getValidators());
- for(ValidatorMetaData vmd : gf.getBuildEnabledValidators()) {
- if(allProjectValidator.contains(vmd.getValidatorUniqueName())) {
- enabledGlobalValidatorsForProject.add(vmd);
- }
- }
- return (ValidatorMetaData[]) enabledGlobalValidatorsForProject.toArray(new ValidatorMetaData[enabledGlobalValidatorsForProject.size()]);
- }
-
- private List<String> getAllValidatorUniqueNames(ValidatorMetaData[] metaData) {
- List<String> names = new ArrayList<String>();
- for(ValidatorMetaData vmd : metaData) {
- names.add(vmd.getValidatorUniqueName());
- }
- return names;
- }
-
-
-
- protected Set<ValidatorMetaData> getManualEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getManualEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- protected Set<ValidatorMetaData> getBuildEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getBuildEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * This method is for use only by the validation framework. Update the task list based on which
- * validators are enabled or disabled. This method should be called only by the validation
- * framework UI classes. Remove the messages belonging to disabled validators.
- */
- public void updateTaskList(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getDisabledValidators();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- // For validators who aren't going to run, clear their messages from the task list.
- // Don't need to check for duplicate entries because each Validator must be unique.
- // The uniqueness of each Validator is checked by the plugin registry.
- WorkbenchReporter.removeAllMessages(project, vmd.getValidatorNames(), null);
- }
- //Message Limit is removed from the framework - WTP1.5M5
- /*if (prjp.numberOfEnabledValidators() > 0) {
- ValidatorManager.getManager().checkMessageLimit(project, false); // Do not remove
- // the exceeded
- // message; only
- // ValidationOperation
- // should do that
- // because it's
- // about to run
- // validation. If
- // the limit is
- // increased,
- // messages may
- // still be
- // missing, so
- // don't remove the
- // "messages may be
- // missing"
- // message.
- } else {
- // Can't run validation, so remove the "exceeded" message
- ValidatorManager.getManager().removeMessageLimitExceeded(project);
- }*/
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
-
- public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- boolean incrementalValEnabled = (prjp.numberOfEnabledIncrementalValidators() > 0);
- return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn, incrementalValEnabled);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn, boolean incrementalValEnabled) {
- boolean doesProjectSupportAutoValidate = doesProjectSupportBuildValidation(project);
- return (doesProjectSupportAutoValidate && isGlobalAutoBuildOn && incrementalValEnabled);
- }
-
- /**
- * Return true if the validator identified by the String is configured on the IProject and
- * enabled on the IProject. Otherwise return false;
- */
- public boolean isEnabled(IProject project, String validatorName) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.isEnabled(validatorName);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only. Return true if the ValidatorMetaData is
- * enabled for the given project
- */
- public boolean isEnabled(IProject project, ValidatorMetaData vmd) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.isEnabled(vmd);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return false;
- }
- }
-
- /**
- * @deprecated For use by the validation framework only.
- */
- public boolean isConfigured(IProject project, ValidatorMetaData vmd) {
- return ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project);
- }
-
- /**
- * This method returns true if the global auto-build setting is turned on.
- */
- public boolean isGlobalAutoBuildEnabled() {
- return ResourcesPlugin.getWorkspace().isAutoBuilding();
- }
-
- /**
- * Returns the number of enabled validators on the given project.
- */
- public int numberProjectEnabledValidators(IProject project) {
- if (project == null) {
- return 0;
- }
-
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- return prjp.numberOfEnabledValidators();
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return 0;
- }
- }
-
-
- /**
- * @deprecated Use ValidationFramework.suspendValidation(project, suspend) directly.
- * @see ValidationFramework#suspendValidation(IProject, boolean)
- */
- public void suspendValidation(IProject project, boolean suspend) {
- ValidationFramework.getDefault().suspendValidation(project, suspend);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().suspendAllValidation(suspend) directly.
- * @see ValidationFramework#suspendAllValidation(boolean)
- */
- public void suspendAllValidation(boolean suspend) {
- ValidationFramework.getDefault().suspendAllValidation(suspend);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isSuspended() directly.
- * @see ValidationFramework#isSuspended()
- */
- public boolean isSuspended() {
- return ValidationFramework.getDefault().isSuspended();
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isSuspended(project) directly.
- * @see ValidationFramework#isSuspended(IProject)
- */
- public boolean isSuspended(IProject project) {
- return ValidationFramework.getDefault().isSuspended(project);
- }
-
- /**
- * @deprecated Use ValidationFramework.getDefault().isProjectSuspended(project) directly.
- * @see ValidationFramework#isProjectSuspended(IProject)
- */
- public boolean isProjectSuspended(IProject project) {
- return ValidationFramework.getDefault().isProjectSuspended(project);
- }
-
- /**
- * @deprecated For use by the validation framework only.
- *
- * Given a list of validators' plugin ids, make those validators enabled for this project. All
- * others, disable for this project.
- */
- public void setEnabledValidators(IProject project, Set<ValidatorMetaData> vmdsSet, IProgressMonitor monitor) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = null;
- if (vmdsSet == null) {
- vmds = new ValidatorMetaData[0];
- } else {
- vmds = new ValidatorMetaData[vmdsSet.size()];
- vmdsSet.toArray(vmds);
- }
-
- prjp.setEnabledValidators(vmds);
-
- updateTaskList(project);
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- }
- }
-
- public static void setResourceUtilClass(Class clazz) {
- _resourceUtilClass = clazz;
- }
-
- /**
- * This method is for use by batch EJB deploy only. Only in batch mode is an infinite number of
- * messages allowed.
- *
- * Enable a project to have an infinite number of messages.
- * @deprecated
- */
- public void setNoMessageLimit(IProject project) {/*
- setMessageLimit(project, WorkbenchReporter.NO_MESSAGE_LIMIT);
- */}
-
- /**
- * This message is for use only by the validation framework. If the "max messages were reported"
- * IMarker exists, return it. Otherwise return null.
- */
- private IMarker[] getLimitMessage(IProject project) {
- IMarker[] exceededMessage = TaskListUtility.getValidationTasks(project, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
- if ((exceededMessage != null) && (exceededMessage.length != 0)) {
- return exceededMessage;
- }
-
- return null;
- }
-
-// /**
-// * Return true if the given IMarker is a "limit was exceeded" message, false otherwise.
-// */
-// private boolean isLimitMessage(IMarker marker) {
-// if (marker == null) {
-// return false;
-// }
-//
-// return TaskListUtility.isOwner(marker, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
-// }
-
-// /**
-// * Return all of the IMarkers on the IProject excluding the "limit was exceeded" message. If
-// * there are no markers, return null.
-// */
-// private IMarker[] getValidationTasksWithoutLimitMessage(IProject project) {
-// IMarker[] allTasks = TaskListUtility.getValidationTasks(project, IMessage.ALL_MESSAGES);
-// if ((allTasks == null) || (allTasks.length == 0)) {
-// return null;
-// }
-//
-// // Don't check if the limit message exists because
-// // any interaction with markers is costly. Since the
-// // interaction has to be done at least once, make that
-// // single occasion in the for loop below.
-// IMarker[] validatorMessages = new IMarker[allTasks.length];
-// int count = 0; // how many markers have been added to the result array?
-// for (int i = 0; i < allTasks.length; i++) {
-// IMarker marker = allTasks[i];
-// if (isLimitMessage(marker)) {
-// continue;
-// }
-// validatorMessages[count++] = marker;
-// }
-//
-// IMarker[] result = new IMarker[count];
-// System.arraycopy(validatorMessages, 0, result, 0, count);
-// return result;
-// }
-
- /**
- * This method should be called only by the validation framework. Return true if the message was
- * removed, false if the message didn't exist.
- * @deprecated This method should be not be used anymore as Message Limit is removed from
- * the framework - WTP1.5M5
- */
- public boolean removeMessageLimitExceeded(IProject project) {
- IMarker[] exceededMessage = getLimitMessage(project);
- if (exceededMessage != null) {
- try {
- ResourcesPlugin.getWorkspace().deleteMarkers(exceededMessage);
- return true;
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- return false;
- }
-
- /**
- * Return true if the last validation operation terminated due to the maximum number of messages
- * having already been reported.
- */
- public boolean wasValidationTerminated(IProject project) {
- IMarker[] exceededMessage = getLimitMessage(project);
- return (exceededMessage != null); // Validation was terminated if the message exists.
- }
-
- private Class getMessageLimitOwner() {
- if (_messageLimitOwner == null) {
- _messageLimitOwner = getClass();
- }
- return _messageLimitOwner;
- }
-
- /**
- * Return true if owner is the name of the class which owns validation framework status
- * messages.
- *
- * ONLY the validation framework should use this method.
- */
- public boolean isInternalOwner(String owner) {
- if (owner == null) {
- return false;
- }
-
- for (int i = 0; i < _internalOwners.length; i++) {
- String internalOwner = _internalOwners[i];
- if (owner.equals(internalOwner)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Add a class to the list of owners of validation messages. ONLY by the validation framework
- * should use this method (it is used for messages owned by framework classes or classes used by
- * the TVT plugin.)
- */
- public void addInternalOwner(Class clazz) {
- if (clazz == null) {
- return;
- }
-
- String[] tempInternalOwners = new String[_internalOwners.length + 1];
- if (_internalOwners.length > 0) {
- System.arraycopy(_internalOwners, 0, tempInternalOwners, 0, _internalOwners.length);
- }
- tempInternalOwners[_internalOwners.length] = WorkbenchReporter.getUniqueId(clazz);
-
- _internalOwners = tempInternalOwners;
- }
-
- public void cacheMessage(IValidatorJob validator, MessageInfo info){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list == null ){
- list = new ArrayList<MessageInfo>();
- _validatorMsgs.put(validator, list);
- }
- list.add(info);
- }
-
- public List<MessageInfo> getMessages(IValidatorJob validator){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list == null )list = new ArrayList<MessageInfo>();
- return list;
- }
-
- public void clearMessages(IValidatorJob validator){
- List<MessageInfo> list = _validatorMsgs.get(validator);
- if( list != null ){
- list.clear();
- }
- _validatorMsgs.remove( validator );
- }
-
-
- public Set<ValidatorMetaData> getProblemValidators() {
- return _problemValidators;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
deleted file mode 100644
index 274ddec..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
+++ /dev/null
@@ -1,277 +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.operations;
-
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-
-/**
- * Run some validators on a given IProject. Any validators which cannot be loaded or which are not
- * registered against this type of project will be ignored.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-public class ValidatorSubsetOperation extends ValidationOperation {
- // By default, assume that there is no default fallback extension
- protected static final String DEFAULT_DEFAULTEXTENSION = null;
-
- /**
- * Create an operation that runs a full validation on the named validators either if validation
- * needs to (@see ValidatorSubsetOperation(IProject)) or if <code>force</code> is true.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, boolean async) {
- this(project, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
- }
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, IWorkbenchContext aWorkenchContext, boolean force, int ruleGroup, boolean async) {
- super(project, aWorkenchContext, null, null, ruleGroup, force, async);
- }
-
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, Object[] changedResources, boolean async) {
- super(project, null, null, ruleGroup, force, async);
- setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- }
-
- /**
- * Create an operation that runs a full validation on the named validators using the
- * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
- * supports the two passes: FAST and FULL.
- *
- * If force is true, validation is run whether or not it needs to.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, boolean async) {
- super(project, null, null, ruleGroup, force, async);
- }
-
- /**
- * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
- * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
- *
- * This constructor should be used when the invoker wishes to force validation on certain
- * resources, without waiting for the user to save their changes.
- *
- * An IllegalArgumentException is thrown if there are no validators registered for the
- * fileExtension on the given IProject.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, String fileExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
- this(project, fileExtension, DEFAULT_DEFAULTEXTENSION, changedResources, async);
- }
-
- /**
- * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
- * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
- *
- * This constructor should be used when the invoker wishes to force validation on certain
- * resources, without waiting for the user to save their changes.
- *
- * If there are no validators configured on files named ".X", then use the validators configured
- * on validators named ".Y", where defaultExtension identifies the fallback extension to use.
- * defaultExtension follows the same syntax as fileExtension.
- *
- * An IllegalArgumentException is thrown if there are no validators registered for the
- * fileExtension or defaultExtension on the given IProject.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, String fileExtension, String defaultExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
- super(project, shouldForce(changedResources), async);
-
- // force the resources to be filtered in even if the validator doesn't normally take them?
- boolean filterIn = false;
-
- // a list of validators which are configured to run on files with that extension.
- // A validator will be in the list whether it has been enabled or disabled by the user.
- ValidatorMetaData[] vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, fileExtension);
- if ((defaultExtension != null) && ((vmds == null) || (vmds.length == 0))) {
- filterIn = true;
- vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, defaultExtension);
- }
-
- if ((vmds == null) || (vmds.length == 0)) {
- throw new IllegalArgumentException();
- }
-
- setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
-
- // construct an array of IFileDelta[] to wrap the Object[];
- // one IFileDelta for each Object in the array
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, filterIn));
- }
-
- /**
- * This constructor is provided for the validation async testing, and is not intended to be
- * called outside the validation framework.
- *
- * Run validation on the changed resources with the given validators. All resources must be from
- * the same project; if they're not, an IllegalArgumentException will be thrown. All validators
- * must be able to run on the resources' project; if not, an IllegalArgumentException will be
- * thrown. If the vmds are either empty or null, an IllegalArgumentExeption will be thrown. If
- * the project is closed or doesn't exist then an IllegalArgumentException will be thrown.
- *
- * The ifileDeltaType is one of the IFileDelta constants: ADDED, CHANGED, or DELETED.
- *
- * IProject must exist and be open.
- *
- * If async is true, the validation will run all thread-safe validators in the background
- * validation thread, and all other validators in the main thread. If async is false, all
- * validators will run in in the main thread.
- */
- public ValidatorSubsetOperation(IProject project, ValidatorMetaData[] vmds, IResource[] changedResources, int ifileDeltaType, boolean force, boolean async) throws IllegalArgumentException {
- // Have to have the IProject as a parameter because ValidationOperation needs the IProject,
- // and the super(..)
- // must be called before anything else in this constructor is called.
- super(project, force, async);
-
- if ((vmds == null) || (vmds.length == 0)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVMD));
- }
-
- if (!project.isOpen()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{project.getName()}));
- }
- if (!project.exists()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{project.getName()}));
- }
-
- if ((changedResources != null) && (changedResources.length > 0)) {
- Set<IProject> tempSet = new HashSet<IProject>();
- for (int i = 0; i < changedResources.length; i++) {
- IProject p = changedResources[i].getProject();
- if (!p.isOpen()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{p.getName()}));
- }
- if (!p.exists()) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{p.getName()}));
- }
- tempSet.add(project);
- }
-
- if (!tempSet.contains(project)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADPRJ, new String[]{project.getName()}));
- }
- if (tempSet.size() != 1) {
- StringBuffer buffer = new StringBuffer("\n"); //$NON-NLS-1$
- Iterator<IProject> iterator = tempSet.iterator();
- while (iterator.hasNext()) {
- IProject p = iterator.next();
- buffer.append("\t"); //$NON-NLS-1$
- buffer.append(p.getName());
- if (iterator.hasNext()) {
- buffer.append(", "); //$NON-NLS-1$
- }
- }
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MULTIPRJ, new String[]{buffer.toString()}));
- }
- }
-
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project)) {
- throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVAL, new String[]{vmd.getValidatorDisplayName(), project.getName()}));
- }
- }
-
- setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, ifileDeltaType)); // construct
- // an array of IFileDelta[] to wrap the IResource[]; one IFileDelta for each IResource in the array
- }
-
- /**
- * Given an array of fully-qualified class names of validators, create the list of validators to
- * be run. The array is not checked for duplicates or for invalid validators (i.e., a validator
- * of that class type is not loaded, or the validator is loaded but cannot run against this type
- * of IProject.)
- */
- public void setValidators(String[] validatorNames) throws IllegalArgumentException {
- Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
- for (String name : validatorNames) {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(name);
- if (vmd == null) {
- // No validator, with that plug-in id, can be run on that project.
- // Either the validator isn't installed, or the IProject passed in
- // doesn't have the necessary nature.
- throw new IllegalArgumentException(name);
- }
- enabled.add(vmd);
- }
- setEnabledValidators(enabled);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use setForce(boolean)
- */
- public void setAlwaysRun(boolean force) {
- setForce(force);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
deleted file mode 100644
index eea36c1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
+++ /dev/null
@@ -1,729 +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.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * Abstract base class for registration of symbolic model names, and also provides the mechanism for
- * registering the load model method which loads a specific type of MOF model, as identified by the
- * symbolic model name.
- */
-public class WorkbenchContext implements IWorkbenchContext {
- private IProject _project;
- private Hashtable<String,Method> _modelRegistry;
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- public List<String> validationFileURIs;
- public static final String GET_PROJECT_FILES = "getAllFiles"; //$NON-NLS-1$
- public static final String GET_FILE = "getFile"; //$NON-NLS-1$
- public static final String VALIDATION_MARKER = "com.ibm.etools.validation.problemmarker"; //$NON-NLS-1$
- public static final String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$
-
- public WorkbenchContext() {
- super();
- _modelRegistry = new Hashtable<String, Method>();
-
- registerModel(IRuleGroup.PASS_LEVEL, "loadRuleGroup"); //$NON-NLS-1$
-
- //the following will register the helper's symbolic methods
- Class [] args = new Class[1] ;
- args[0] = String.class ; // a string argument denoting a specific JSP.
- registerModel(GET_FILE, "getFile", args);//$NON-NLS-1$
- registerModel(GET_PROJECT_FILES, "getFiles", args);//$NON-NLS-1$
- }
-
- /**
- * When the validation is complete, this method will be called so that the IWorkbenchContext can
- * clean up any resources it allocated during the validation.
- *
- * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
- */
- public void cleanup(WorkbenchReporter reporter) {
- // Default: nothing to clean up
- }
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- */
- public void closing() {
- closing(getProject());
- }
-
- /**
- * When the IProject is closing, perform any cleanup that needs to be done. When this method is
- * called, if the helper has cached any resources from the IProject, it should release those
- * resources. If you do not allocate resources in your helper, then this method should be a
- * no-op.
- *
- * @deprecated Override closing() instead, and use getProject()
- */
- public void closing(IProject project) {
- //do nothing
- }
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- */
- public void deleting() {
- deleting(getProject());
- }
-
- /**
- * When the IProject is being deleted, perform any cleanup that needs to be done. When this
- * method is called, if the helper has cached any resources from the IProject, it should release
- * those resources. If you do not allocate resources in your helper, then this method should be
- * a no-op.
- *
- * @deprecated Override deleting() instead, and use getProject()
- */
- public void deleting(IProject project) {
- //do nothing
- }
-
- /**
- * Returns the IPath of a resource, relative to the container. If the IResource is not a member
- * of the container, return null. This method should be useful for implementors of this class;
- * specifically, in their getPortableName method.
- */
- public static String getContainerRelativePath(String fullPath, IContainer container) {
- if ((fullPath == null) || (container == null))
- return null;
- IPath relPath = getContainerRelativePath(new Path(fullPath), container);
- if (relPath != null)
- return relPath.toString();
- return null;
- }
-
- /**
- * Returns the IPath of a resource, relative to the container. If the IResource is not a member
- * of the container, return null. This method should be useful for implementors of this class;
- * specifically, in their getPortableName method.
- */
- public static IPath getContainerRelativePath(IResource resource, IContainer container) {
- if ((resource == null) || (container == null)) {
- return null;
- }
-
- IResource foundResource = null;
- IPath relPath = getContainerRelativePath(resource.getFullPath(), container);
- if (relPath != null) {
- // if relPath is null, the resource is not a direct member of the container
- try {
- if (!resource.exists()) { // findMember won't work
- if (resource instanceof IFile) {
- foundResource = container.getFile(relPath);
- } else if (resource instanceof IFolder) {
- foundResource = container.getFolder(relPath);
- }
- } else {
- foundResource = container.findMember(relPath, true); // true means include
- // phantom resources
- if ((foundResource != null) && !foundResource.exists()) {
- foundResource = null;
- }
- }
- } catch (IllegalArgumentException e) {
- foundResource = null;
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- if (foundResource == null) {
- return null;
- }
-
- // file has been found
- int matchingFirstSegments = container.getProjectRelativePath().matchingFirstSegments(resource.getProjectRelativePath());
- return resource.getProjectRelativePath().removeFirstSegments(matchingFirstSegments);
- }
-
- /**
- * Given an IPath, if the IPath is absolute, and is a part of the IContainer, return an IPath
- * which is relative to the container. If the IPath is not part of the IContainer, return null.
- */
- public static IPath getContainerRelativePath(IPath path, IContainer container) {
- if ((path == null) || (container == null)) {
- return null;
- }
-
- if (path.isAbsolute()) {
- // Is the path part of the IContainer?
- int matchingFirstSegments = path.matchingFirstSegments(container.getFullPath());
- if ((matchingFirstSegments > 0) && (matchingFirstSegments == container.getFullPath().segmentCount())) {
- // part of the IContainer
- return path.removeFirstSegments(matchingFirstSegments);
- }
- // not part of the IContainer
- return null;
- }
- // path is relative
- // Is the path part of the IContainer?
- //TODO don't have time to implement this now, but should in future. - Ruth
- return null;
- }
-
- /**
- * Given an IMessage's target object, return a string which identifies the object, so that the
- * user can locate it.
- */
- public String getDescription(Object object) {
- if (object == null) {
- return ""; //$NON-NLS-1$
- }
-
- if (object instanceof WorkbenchFileDelta) {
- WorkbenchFileDelta wfd = (WorkbenchFileDelta) object;
- if (wfd.getResource() != null) {
- // resource will be null if WorkbenchFileDelta was constructed from an Object
- // instead of an IResource
- return wfd.getResource().getFullPath().toString();
- }
- }
-
- return object.toString();
- }
-
- /**
- * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
- * Otherwise return null.
- *
- * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
- * list entry, the IResource, to which the entry applies, must be identified. The IReporter
- * interface passes in an Object in these methods:
- *
- * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
- *
- * removeAllMessages(IValidator, Object),
- *
- * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
- * represents in the workbench, in order to be able to add the task list entry.
- *
- * If this method returns null, then the WorkbenchReporter will add the message to the IProject
- * instead of an IFile.
- *
- */
- public IFile getFile(Object obj) {
- return null;
- }
-
- public IResource getResource(Object obj) {
- if (obj == null) {
- return null;
- }
-
- IResource res = null;
- if (obj instanceof WorkbenchFileDelta) {
- // resource may be null if WorkbenchFileDelta was constructed from an Object instead of
- // an IResource
- res = ((WorkbenchFileDelta) obj).getResource();
- } else if (obj instanceof IResource) {
- res = (IResource) obj;
- }
-
- if ((res == null) || (!res.exists())) {
- return getFile(obj);
- }
-
- return res;
- }
-
- /**
- * If the IProject is associated with an EJBNatureRuntime, return the IJavaProject which
- * represents it.
- */
-// public static IJavaProject getJavaProject(IProject project) {
-// if (project == null) {
-// return null;
-// }
-// return JavaCore.create(project);
-// }
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents. If the object is null, or if access to line numbers is not possible,
- * return "0".
- */
- public int getLineNo(Object object) {
- IResourceUtil util = ValidatorManager.getResourceUtil();
- if (util == null) {
- return IMessage.LINENO_UNSET;
- }
- try {
- return util.getLineNo(object);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- return IMessage.LINENO_UNSET;
- }
-
- }
-
- /**
- * Given an IMessage's target object, return the line number, of the IFile, which the target
- * object represents, if possible. If the object is null, or if access to line numbers is not
- * possible, return a text description of the location.
- *
- * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
- * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
- * description of the location must be returned.
- */
- public String getLocation(Object object) {
- IResource res = getResource(object);
- if ((res == null) || !(res instanceof IFile))
- // return a text description
- return getDescription(object);
- // default to a line number, if it's available. Else, use a text description.
- int lineNumber = getLineNo(object);
- if (lineNumber == IMessage.LINENO_UNSET) {
- return getDescription(object);
- }
- // return the line number
- return String.valueOf(lineNumber);
- }
-
- /**
- * Given a name of a load method, and the types of parameters it takes (this method is always
- * called with null as the second parameter), return the java.lang.reflect.Method which
- * represents the load method.
- */
- private final Method getMethod(String methodName, Class[] parmTypes) {
- Method m = null;
- try {
- m = getClass().getMethod(methodName, parmTypes);
- } catch (NoSuchMethodException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
-
- return m;
- }
-
- /**
- * @see IWorkbenchContext.getPortableName(IResource)
- */
- public String getPortableName(IResource resource) {
- return resource.getFullPath().toString();
- }
-
- /**
- * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
- * traverse a certain type of IProject, for example, an EJB project or a web project.
- */
- public final IProject getProject() {
- return _project;
- }
-
- /**
- * Get the IFile for the given filename.
- *
- * @param filename The name of the file to retrieve.
- * @return An IFile representing the file specified or null if it can't be resolved.
- */
- public IFile getFile(String filename)
- {
- // System.out.println("file name = " + filename);
- IResource res = getProject().findMember(filename, true); // true means include phantom resources
- if (res instanceof IFile)
- {
- return (IFile) res;
- }
- return null;
- }
-
- /**
- * Get the collection of files from the project that are relevant for the
- * validator with the given class name.
- *
- * @param validatorClassName The name of the validator class.
- * @return The collection of files relevant for the validator class specified.
- */
- public Collection<IFile> getFiles(String validatorClassName)
- {
- IProject project = getProject();
- List<IFile> files = new ArrayList<IFile>();
- getFiles(files, project, validatorClassName);
- return files;
- }
-
- /**
- * Get the collection of files from the project that are relevant for the
- * validator with the given class name.
- *
- * @param files The files relevant for the class name.
- * @param resource The resource to look for files in.
- * @param validatorClassName The name of the validator class.
- */
- protected void getFiles(Collection<IFile> files, IContainer resource, String validatorClassName)
- {
- try
- {
- IResource [] resourceArray = resource.members(false);
- for (int i=0; i<resourceArray.length; i++)
- {
- if (ValidatorManager.getManager().isApplicableTo(validatorClassName, resourceArray[i]))
- {
- if (resourceArray[i] instanceof IFile)
- files.add((IFile)resourceArray[i]);
- }
- if (resourceArray[i].getType() == IResource.FOLDER)
- getFiles(files,(IContainer)resourceArray[i], validatorClassName) ;
- }
- }
- catch (Exception e) {}
- }
-
-
-// /**
-// * Return the folders (or project) which contain the .java source files.
-// */
-// public static IContainer[] getProjectSourceContainers(IProject project) {
-// if (project == null) {
-// return NO_CONTAINERS;
-// }
-//
-// IJavaProject jp = getJavaProject(project);
-// if (jp == null) {
-// return NO_CONTAINERS;
-// }
-//
-// return getProjectSourceContainers(jp);
-// }
-
- /**
- * Return the folders (or project) which contain the .java source files.
- */
-// public static IContainer[] getProjectSourceContainers(IJavaProject javaProject) {
-// if (javaProject == null) {
-// return NO_CONTAINERS;
-// }
-// IProject project = javaProject.getProject();
-//
-// IClasspathEntry[] classpath = null;
-// try {
-// classpath = javaProject.getResolvedClasspath(true); // true means ignore unresolved
-// // (missing) variables, instead of
-// // throwing an exception
-// } catch (JavaModelException exc) {
-// Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-// if (logger.isLoggingLevel(Level.SEVERE)) {
-// LogEntry entry = ValidationPlugin.getLogEntry();
-// entry.setSourceID("WorkbenchContext::getProjectSourceContainers(IJavaProject)"); //$NON-NLS-1$
-// entry.setTargetException(exc);
-// logger.write(Level.SEVERE, entry);
-// }
-// return NO_CONTAINERS;
-// }
-//
-// if (classpath == null) {
-// return NO_CONTAINERS;
-// }
-//
-// // Traverse the classpath, and calculate a list of just the
-// // IFolders and IProjects (i.e., IContainers) which contain source
-// IContainer[] icontainers = new IContainer[classpath.length];
-// int validCount = 0;
-// for (int i = 0; i < classpath.length; i++) {
-// IClasspathEntry entry = classpath[i];
-// if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-// IPath entryPath = entry.getPath();
-// IPath relEntryPath = getContainerRelativePath(entryPath, project);
-// if (relEntryPath == null) {
-// // classpath entry refers to something which doesn't exist
-// continue;
-// }
-//
-// IResource outputResource = project.findMember(relEntryPath);
-// if (outputResource == null) {
-// // classpath entry refers to something which doesn't exist
-// continue;
-// }
-//
-// if (outputResource instanceof IContainer) {
-// icontainers[validCount++] = (IContainer) outputResource;
-// }
-// }
-// }
-//
-// // following line causes a ClassCastException, so construct an array of IContainers
-// // explicitly
-// // return (IContainer[])icontainers.toArray();
-// IContainer[] containers = new IContainer[validCount];
-// System.arraycopy(icontainers, 0, containers, 0, validCount);
-// return containers;
-// }
-
- public int getRuleGroup() {
- return _ruleGroup;
- }
-
- /**
- * This method can be overriden by AWorkbenchHelpers, if they wish to perform some
- * initialization once the IProject is set. Default is to do nothing.
- *
- * For example, if this IWorkbenchContext delegates to another IWorkbenchContext, then that
- * IWorkbenchContext's setProject() method should be called here.
- */
- public void initialize() {
- //do nothing
- }
-
- /**
- * Return true if the given resource is in an IJavaProject, and if it is in one of the source
- * folders in the IJavaProject. If the project's source folder happens to be the project's
- * output folder too, this method will return true. If res is null, or is not found in one of
- * the source containers, this method will return false.
- */
-// public boolean isInJavaSourcePath(IResource res) {
-// if (res == null) {
-// return false;
-// }
-//
-// IContainer[] containers = getProjectSourceContainers(res.getProject());
-// for (int c = 0; c < containers.length; c++) {
-// IPath resourcePath = getContainerRelativePath(res, containers[c]);
-// if (resourcePath != null) {
-// // file has been found
-// return true;
-// }
-// }
-//
-// return false;
-// }
-
- /**
- * Return true if the given symbolic name is registered, and can be loaded by WorkbenchContext's
- * "loadModel" method. For further information, see the comment above WorkbenchContext's
- * "registerModel" method.
- */
- public final boolean isRegistered(String symbolicName) {
- if (symbolicName == null)return false;
- return _modelRegistry.containsKey(symbolicName);
- }
-
- /**
- * Given a symbolic name, load the MOF model which is identified by that name.
- *
- * For support of dynamic symbolic names, such as file names, read the comment above the
- * registerModel method.
- *
- * @see registerModel
- */
- public Object loadModel(String symbolicName) {
- return loadModel(symbolicName, null);
- }
-
- /**
- * Given a symbolic name, load the MOF model which is identified by that name.
- *
- * For support of dynamic symbolic names, such as file names, read the comment above the
- * registerModel method.
- *
- * @see registerModel
- */
- public Object loadModel(String symbolicName, Object[] parms) {
- try {
- Method loader = _modelRegistry.get(symbolicName);
- if (loader == null)return null;
-
- return loader.invoke(this, parms);
- } catch (IllegalAccessException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- } catch (InvocationTargetException e) {
- ValidationPlugin.getPlugin().handleException(e);
- ValidationPlugin.getPlugin().handleException(e.getTargetException());
- return null;
- } catch (NullPointerException e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- } catch (ExceptionInInitializerError e) {
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- }
-
- public Object loadRuleGroup() {
- return new Integer(getRuleGroup()); // have to wrap the int in an Integer because can't cast
- // an int to an Object
- }
-
- /**
- * This method should be used only by the validation framework. This method will be called by
- * ValidationOperation, before the IValidator's validate method is called, to set the group of
- * rules which the IValidator should check.
- */
- public void setRuleGroup(int rg) {
- _ruleGroup = rg;
- }
-
- /**
- * Register a load method for a symbolic name. A load method is defined as a method which takes
- * no parameters and returns a RefObject.
- *
- * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
- * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
- * as file names, each IWorkbenchContext should override the "loadModel" method. Their
- * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
- * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
- * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
- * method. Otherwise, it should return the result based on its own processing.
- *
- * When this method is called, the load method identified by loadMethodName is located & stored
- * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
- * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
- * the result (RefObject) returned by that method is returned by "loadModel".
- *
- * symbolicName must not be null or the empty string. loadMethodName must not be null or the
- * empty string.
- */
- protected final void registerModel(String symbolicName, String loadMethodName) {
- registerModel(symbolicName, loadMethodName, null);
- }
-
- /**
- * Register a load method for a symbolic name. A load method is defined as a method which takes
- * no parameters and returns a RefObject.
- *
- * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
- * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
- * as file names, each IWorkbenchContext should override the "loadModel" method. Their
- * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
- * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
- * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
- * method. Otherwise, it should return the result based on its own processing.
- *
- * When this method is called, the load method identified by loadMethodName is located & stored
- * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
- * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
- * the result (RefObject) returned by that method is returned by "loadModel".
- *
- * symbolicName must not be null or the empty string. loadMethodName must not be null or the
- * empty string.
- */
- protected final void registerModel(String symbolicName, String loadMethodName, Class[] parms) {
- Method method = getMethod(loadMethodName, parms);
- if (method == null) {
- if (Tracing.isLogging()) {
- StringBuffer buffer = new StringBuffer("WorkbenchContext-01: load method "); //$NON-NLS-1$
- buffer.append(loadMethodName);
- buffer.append("("); //$NON-NLS-1$
- for (int i = 0; (parms != null) && (i < parms.length); i++) {
- buffer.append(parms[i]);
- }
- buffer.append(") must exist. " + getClass().getName() + " cannot support model " + symbolicName); //$NON-NLS-1$ //$NON-NLS-2$
-
- Tracing.log(buffer);
- }
- } else {
- _modelRegistry.put(symbolicName, method);
- }
- }
-
- /**
- * Whether full or incremental validation is running, this method will be called, for every
- * IResource which is filtered in by the IValidator, so that the IValidationContext can receive
- * notification that one of the resources, which validation will run on, is being filtered in.
- */
- public void registerResource(IResource resource) {
- // default: do nothing
- }
-
- /**
- * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
- * it can gather information from the current project.
- *
- * If an IWorkbenchContext delegates some model loading to another IWorkbenchContext, this method
- * should be overriden so that the delegatee IWorkbenchContext is initialized with the IProject.
- */
- public final void setProject(IProject project) {
- _project = project;
-
- if (project != null) {
- // Project will be set back to null once the validation of the project is complete.
- initialize();
- }
- }
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- */
- public void shutdown() {
- // Default is to assume that no resources were allocated; therefore,
- // no cleanup needs to be done.
- shutdown(getProject());
- }
-
- /**
- * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
- * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
- * resources may already be closed by the time that those methods are called, so EVERYTHING
- * should be cleaned up in this method. The parameter passed in is the project which is about to
- * shut down. This method will be called once for every IProject in the workbench. The IProject
- * may, or may not, be closed.
- *
- * @deprecated Override shutdown() instead, and use getProject()
- */
- public void shutdown(IProject project) {
- // Default is to assume that no resources were allocated; therefore,
- // no cleanup needs to be done.
- }
-
- public String getTargetObjectName(Object object) {
- return null;
- }
-
- public String[] getURIs() {
- String[] uris = new String[validationFileURIs.size()];
- validationFileURIs.toArray(uris);
- return uris;
- }
-
- /**
- * @return Returns the validationFileURIs.
- */
- public List<String> getValidationFileURIs() {
- return validationFileURIs;
- }
-
- /**
- * @param validationFileURIs The validationFileURIs to set.
- */
- public void setValidationFileURIs(List<String> validationFileURIs) {
- this.validationFileURIs = validationFileURIs;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
deleted file mode 100644
index 0953e0a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
+++ /dev/null
@@ -1,78 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.operations;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.core.FileDelta;
-import org.eclipse.wst.validation.internal.core.IFileDelta;
-
-
-/**
- * Eclipse-specific implementation of FileDelta which also caches the IResource which is associated
- * with the FileDelta.
- */
-public class WorkbenchFileDelta extends FileDelta {
- private IResource _resource;
- private Object _changedResource;
-
- private static final String FILE_NAME = "FILE NAME:"; //$NON-NLS-1$
- private static final String DELTA = " DELTA: "; //$NON-NLS-1$
- private static final String RESOURCE = " RESOURCE: "; //$NON-NLS-1$
- private static final String OBJECT = " OBJECT: "; //$NON-NLS-1$
-
- public WorkbenchFileDelta(String aFileName, int aFileDelta, IResource resource) {
- super(aFileName, aFileDelta);
- setResource(resource);
- setObject(resource);
- }
-
- public WorkbenchFileDelta(Object changedResource) {
- super(null, IFileDelta.CHANGED);
- setObject(changedResource);
- }
-
- public IResource getResource() {
- return _resource;
- }
-
- public void setResource(IResource resource) {
- _resource = resource;
- }
-
- /**
- * If the changed resource is not an IResource (e.g., a RefObject), then the getFileName method
- * will return null, getResource will return null, and this method will return the object. If
- * the changedResource is an IResource, then both this method and the getResource method will
- * return the resource.
- */
- public Object getObject() {
- return _changedResource;
- }
-
- /**
- * @see getObject()
- */
- public void setObject(Object o) {
- _changedResource = o;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer(FILE_NAME);
- buffer.append(String.valueOf(getFileName()));
- buffer.append(DELTA);
- buffer.append(getDeltaType());
- buffer.append(RESOURCE);
- buffer.append(String.valueOf(getResource()));
- buffer.append(OBJECT);
- buffer.append(String.valueOf(getObject()));
- return buffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
deleted file mode 100644
index f9162f3..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
+++ /dev/null
@@ -1,597 +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.operations;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * IValidator instances will interact with an instance of this class, but should never cast that
- * IReporter instance to WorkbenchReporter.
- * <p>
- * This class handles interaction between the user and the IValidator in the eclipse workbench
- * environment.
- * <p>
- * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
- * resource deltas can be generated by the methods in this class.
- * <p>
- * Only the validation framework may instantiate or alter instances of this class.
- */
-
-public class WorkbenchReporter implements IReporter {
- public static final String DEFAULT_LOCATION = ""; //$NON-NLS-1$
- public static final int NO_MESSAGE_LIMIT = -1;
-
- private IProject _project;
- private IProgressMonitor _monitor;
-
- public static void addMessage(IResource resource, Class messageOwner, IMessage message) {
- addMessage(resource, messageOwner, null, message);
- }
-
- public static void addMessage(IResource resource, Class messageOwner, ClassLoader cl, IMessage message) {
- addMessage(resource, messageOwner, cl, message, null, ""); //$NON-NLS-1$
- }
-
- public static void addMessage(IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location) {
- addMessage(resource, clazz, null, message, targetObjectName, location);
- }
-
- public static void addMessage(IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location,String markerId) {
- addMessage(resource, clazz, null, message, targetObjectName, location,markerId);
- }
-
- public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message,
- String targetObjectName, String location) {
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- if (cl == null)cl = clazz.getClassLoader();
-
- addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location);
- }
-
- public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message,
- String targetObjectName, String location, String markerId) {
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- if (cl == null)cl = clazz.getClassLoader();
-
- addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location, markerId);
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl, IMessage message) {
- addMessage(resource, messageOwnerId, cl, message, null, ""); //$NON-NLS-1$
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl,
- IMessage message, String targetObjectName, String location) {
- int severity = message.getSeverity();
- try {
- TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(),
- message.getText(cl), severity,targetObjectName, message.getGroupName(),
- message.getOffset(), message.getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl,
- IMessage message, String targetObjectName, String location, String markerId) {
- int severity = message.getSeverity();
- try {
- TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(),
- message.getText(cl), severity,markerId,targetObjectName, message.getGroupName(),
- message.getOffset(), message.getLength());
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeAllMessages(IResource resource, IValidator validator) {
- if (resource == null)return;
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- // log
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- try {
- TaskListUtility.removeAllTasks(resource, validatorNames);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Should not be called outside of the validation
- * framework.
- */
- public static void removeAllMessages(IResource resource, IValidator validator, Object object) {
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- // log
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- try {
- //String targetObjectName = getTargetObjectName(vmd.getHelper(resource.getProject()), object);
- String targetObjectName = getTargetObjectName( getHelper( resource.getProject(), validator), object);
- removeAllMessages(resource, validatorNames, targetObjectName);
- } catch (InstantiationException e) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeAllMessages(IResource resource, String[] validatorNames, String targetObjectName) {
- try {
- TaskListUtility.removeAllTasks(resource, validatorNames, targetObjectName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public static void removeMessageSubset(IResource resource, Class messageOwner, String groupName) {
- // Since the addMessage(Class, IMessage) is defaulted to the IProject,
- // remove the message subsets from the IProject
- removeMessageSubset(resource, new String[]{getUniqueId(messageOwner)}, null, groupName);
- }
-
- public static void removeMessageSubset(IResource resource, String messageOwnerId, String groupName) {
- // Since the addMessage(Class, IMessage) is defaulted to the IProject,
- // remove the message subsets from the IProject
- removeMessageSubset(resource, new String[]{messageOwnerId}, null, groupName);
- }
-
- public static void removeMessageSubset(IResource resource, String[] ownerId, String targetObjectName, String groupName) {
- try {
- TaskListUtility.removeTaskSubset(resource, ownerId, targetObjectName, groupName);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Given a Class instance, return the id that uniquely identifies this instance. (Used as the
- * value for the message owner.)
- */
- public static String getUniqueId(Class clazz) {
- if (clazz == null) {
- return ""; //$NON-NLS-1$
- }
-
- // It is safe to load this String into the constants space because
- // the Class name will not change during WSAD's session.
- return clazz.getName().intern();
- }
-
- public static String getUniqueId(IValidator validator) {
- if (validator == null) {
- return ""; //$NON-NLS-1$
- }
- return getUniqueId(validator.getClass());
- }
-
- public static String getLocation(IWorkbenchContext helper, IMessage message) {
- if (message == null) {
- return getLocationText(helper, null);
- }
- int lineNo = message.getLineNumber();
- if (lineNo == IMessage.LINENO_UNSET) {
- return getLocationText(helper, message.getTargetObject());
- }
- return String.valueOf(lineNo);
- }
-
- public static String getLocationText(IWorkbenchContext helper, Object targetObject) {
- String location = null;
- try {
- location = helper.getLocation(targetObject);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- if ((location == null) || (location.trim().equals(""))) { //$NON-NLS-1$
- location = DEFAULT_LOCATION;
- }
- return location;
- }
-
- // TODO This method was made protected for the SaberReporter. Make this method private again
- // once the framework supports IMarker.PRIORITY.
- protected static String getTargetObjectName(IWorkbenchContext helper, IMessage message) {
- if (message == null) {
- return getTargetObjectName(helper, null);
- }
- return getTargetObjectName(helper, message.getTargetObject());
- }
-
- private static String getTargetObjectName(IWorkbenchContext helper, Object targetObject) {
- String targetObjectName = null;
- try {
- targetObjectName = helper.getTargetObjectName(targetObject);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- return targetObjectName;
- }
-
- // TODO This method was made "protected" for the SaberReporter. Do not call this method! This
- // method will be made private once support for marker PRIORITY attributes is in the framework.
- protected static ValidatorMetaData getVMD(IValidator validator) throws IllegalArgumentException {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- throw new IllegalArgumentException(); // already logged in the ValidationRegistryReader
- }
- return vmd;
- }
-
- /**
- * @deprecated. The IValidationContext will be ignored.
- */
- public WorkbenchReporter(IWorkbenchContext helper, IProgressMonitor monitor, IProject project) {
- this(project, monitor);
- }
-
- /**
- * An IReporter instance must exist for each Runnable in order for the validator to report
- * status messages. IProject and IProgressMonitor must not be null.
- */
- public WorkbenchReporter(IProject project, IProgressMonitor monitor) {
- super();
- _project = project;
- _monitor = monitor;
- }
-
- // TODO This method was made protected for the SaberReporter. Make it private again once the
- // framework support IMarker.PRIORITY.
- protected IWorkbenchContext getHelper(IValidator validator) throws InstantiationException, IllegalArgumentException {
- ValidatorMetaData vmd = getVMD(validator);
- IWorkbenchContext helper = vmd.getHelper( getProject(), validator );
- return helper;
- }
-
- protected static IWorkbenchContext getHelper(IProject project, IValidator validator) throws InstantiationException, IllegalArgumentException {
- ValidatorMetaData vmd = getVMD(validator);
- IWorkbenchContext helper = vmd.getHelper( project, validator );
- return helper;
- }
-
- public IProject getProject() {
- return _project;
- }
-
- public IProgressMonitor getProgressMonitor() {
- return _monitor;
- }
-
- /**
- * This method will never return null.
- */
- private IResource getDefaultResource() {
- IResource prj = getProject();
- if (prj != null) {
- return prj;
- }
- // return the workspace root
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- /**
- * When an IMessage is created, the user has the option of creating it with a target object.
- * That target object is used to identify which object has the problem identified by the
- * IMessage. This method, given the target object, returns the IResource which represents that
- * object in the workbench.
- */
- public IResource getMessageResource(IValidator validator, Object object) {
- if (validator == null) {
- return null;
- }
-
- IResource resource = null;
- if (object != null) {
- if (object instanceof IResource) {
- resource = (IResource) object;
- } else if (object instanceof WorkbenchFileDelta) {
- // resource may be null if the WorkbenchFileDelta was constructed from an Object
- // instead of an IResource
- resource = ((WorkbenchFileDelta) object).getResource();
- }
-
- if (resource == null) {
- try {
- IWorkbenchContext helper = getHelper(validator);
- resource = helper.getResource(object);
- } catch (InstantiationException e) {
- try {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
- ValidatorMetaData vmd = getVMD(validator);
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- ValidationPlugin.getPlugin().handleException(e);
- } catch (IllegalArgumentException e2) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e2);
- }
- } catch (IllegalArgumentException e) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e);
- } catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- if (resource == null) {
- resource = getDefaultResource();
- }
-
- if (!resource.exists()) {
- resource = getDefaultResource();
- }
-
- return resource;
- }
-
- /**
- * Show a message to the user indicating which subtask is currently being processed. <br>
- * <br>
- * <code>message</code> may not be null or the empty string (""). <br>
- */
- public void displaySubtask(String message) {
- if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
- return;
- }
-
- if (getProgressMonitor() != null) {
- getProgressMonitor().subTask(message);
- } else {
- System.out.println(message);
- }
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#getMessages()
- */
- public List getMessages() {
- return null;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#isCancelled()
- */
- public boolean isCancelled() {
- if (getProgressMonitor() != null) {
- return getProgressMonitor().isCanceled();
- }
- return false;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#addMessage(IValidator, IMessage)
- */
- public void addMessage(IValidator validator, IMessage message) {
- IResource resource = getMessageResource(validator, message.getTargetObject());
- IWorkbenchContext helper = null;
- ValidatorMetaData vmd = getVMD(validator);
- try {
- helper = getHelper(validator);
- } catch (InstantiationException e) {
- try {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
- return;
- } catch (IllegalArgumentException exc2) {
- logDisabledValidator(exc2);
- return;
- }
- } catch (IllegalArgumentException exc) {
- logDisabledValidator(exc);
- return;
- }
-
- if (resource == null) {
- if (Tracing.isLogging()) {
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(
- ResourceConstants.VBF_EXC_INVALID_RESOURCE),
- new Object[]{message.getText(), getTargetObjectName(helper, message)});
- Tracing.log("WorkbenchReporter-01: ", result); //$NON-NLS-1$
- }
- return;
- }
-
- if( validator instanceof IValidatorJob ){
- cacheMessage( (IValidatorJob)validator, resource, validator.getClass(), message,
- getTargetObjectName(helper, message), getLocation(helper, message), getMarkerId(vmd, message) );
- }else
- addMessage(resource, validator.getClass(), message, getTargetObjectName(helper, message),
- getLocation(helper, message),getMarkerId(vmd,message));
- }
-
- private String getMarkerId(ValidatorMetaData vmd, IMessage message) {
- if (vmd.getMarkerIds() != null) {
- if (vmd.getMarkerIds().length == 1)
- return vmd.getMarkerIds()[0];
- else if (vmd.getMarkerIds().length > 1) {
- String messageMarkerId = message.getMarkerId();
- if (messageMarkerId != null && messageMarkerId.length() > 0) {
- String firstMarkerId = vmd.getMarkerIds()[0];
- String pluginQualifier = firstMarkerId.substring(0, firstMarkerId.lastIndexOf(".")); //$NON-NLS-1$
- String qualifiedMessageMarkerId = null;
- if (messageMarkerId.indexOf(pluginQualifier) == -1)
- qualifiedMessageMarkerId = pluginQualifier + "." + messageMarkerId; //$NON-NLS-1$
- else
- qualifiedMessageMarkerId = messageMarkerId;
- if (Arrays.asList(vmd.getMarkerIds()).contains(qualifiedMessageMarkerId))
- return qualifiedMessageMarkerId;
- }
- }
- }
- return null;
- }
-
- private void logDisabledValidator(IllegalArgumentException e) {
- // Even the IValidator is invalid. Unfortunately, can't disable the
- // validator because it can't be found by the registry reader.
- // Log the reason for the disabled validator
- ValidationPlugin.getPlugin().handleException(e);
- return;
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#displaySubtask(IValidator, IMessage)
- */
- public void displaySubtask(IValidator validator, IMessage message) {
- if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
- return;
- }
-
- displaySubtask(message.getText(validator.getClass().getClassLoader()));
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator)
- */
- public void removeAllMessages(IValidator validator) {
- if (validator == null) { // getHelper could be null if the user cancelled before something
- // was fully initialized
- return;
- }
-
- removeAllMessages(validator, null);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator, Object)
- */
- public void removeAllMessages(IValidator validator, Object object) {
- IResource resource = getMessageResource(validator, object);
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- return;
- }
-
- IWorkbenchContext helper = null;
- try {
- //helper = vmd.getHelper(resource.getProject());
- helper = getHelper(validator);
- } catch (InstantiationException e) {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
-
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- String targetObjectName = getTargetObjectName(helper, object);
- removeAllMessages(resource, validatorNames, targetObjectName);
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeMessageSubset(IValidator, Object, String)
- */
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
- IResource resource = getMessageResource(validator, obj);
- if (resource == null) {
- return;
- }
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- return;
- }
-
-
- IWorkbenchContext helper = null;
- try {
- //helper = vmd.getHelper(resource.getProject());
- helper = getHelper( resource.getProject(), validator );
- }
- catch (InstantiationException e) {
- // Unlikely that an exception will be thrown, because this method is
- // invoked by the validator, and if the validator is invoked, it's likely
- // that the helper has been loaded too.
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- ValidationPlugin.getPlugin().handleException(e);
-
- return;
- }
-
- String[] validatorNames = vmd.getValidatorNames();
- String targetObjectName = getTargetObjectName(helper, obj);
- removeMessageSubset(resource, validatorNames, targetObjectName, groupName);
- }
-
- private static void cacheMessage( IValidatorJob validator,
- IResource resource, Class clazz, IMessage message,
- String targetObjectName, String location, String markerId ){
-
- if ((clazz == null) || (message == null) || (resource == null))return;
-
- ClassLoader cl = clazz.getClassLoader();
- String text = message.getText(cl);
- MessageInfo msgInfo = new MessageInfo(getUniqueId(clazz), resource, location,
- text, targetObjectName, markerId, message );
-
- ValidatorManager.getManager().cacheMessage( validator, msgInfo );
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
deleted file mode 100644
index 887f7cd..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
+++ /dev/null
@@ -1,103 +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.plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-
-public class ValidationHelperRegistryReader {
-
- /** validationHelper - extension point name. */
- public static final String VALIDATION_HELPER = "validationHelper"; //$NON-NLS-1$
-
- static final String ATT_ID = "id"; //$NON-NLS-1$
-
- /** helperClass - class that implements the extension. */
- static final String ATT_HELPER_CLASS = "helperClass"; //$NON-NLS-1$
-
- private static ValidationHelperRegistryReader INSTANCE = null;
- private List<IProjectValidationHelper> _validationHelpers;
-
- public ValidationHelperRegistryReader() {
- }
-
- public static ValidationHelperRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationHelperRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * Read the extension point and parse it.
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_HELPER);
- if (point == null)return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
- }
-
- private List<IProjectValidationHelper> getValidationHelpers() {
- if (_validationHelpers == null)
- _validationHelpers = new ArrayList<IProjectValidationHelper>();
- return _validationHelpers;
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VALIDATION_HELPER))
- return false;
- IProjectValidationHelper helper = null;
- try {
- helper = (IProjectValidationHelper) element.createExecutableExtension(ATT_HELPER_CLASS);
- getValidationHelpers().add(helper);
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public IProjectValidationHelper getValidationHelper() {
- if (getValidationHelpers().isEmpty())return null;
- return getValidationHelpers().get(0);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
deleted file mode 100644
index 2b8b8dd..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
+++ /dev/null
@@ -1,181 +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.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.DependencyIndex;
-import org.eclipse.wst.validation.internal.EventManager;
-import org.eclipse.wst.validation.internal.ProjectUnavailableError;
-import org.eclipse.wst.validation.internal.ResourceUnavailableError;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * How does this plug-in get activated? There are many other plug-ins that depend on this plug-in, so there are
- * many paths that will activate it. One common path is the J2EE perspective. If the J2EE plug-in start method, they
- * reference a class in this plug-in, which activates the plug-in. For that case this plug-in will be active even before
- * the workbench is up.
- */
-public class ValidationPlugin extends Plugin {
- public static final String VALIDATION_PROP_FILE_NAME = "validate_base"; //$NON-NLS-1$
-
- /** org.eclipse.wst.validation - the plug-in id */
- public static final String PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
- private static ValidationPlugin _plugin;
- private static Message _message;
- public static final String VALIDATION_BUILDER_ID = PLUGIN_ID + ".validationbuilder"; //$NON-NLS-1$// plugin id of the validation builder
- public static final String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$// extension point declaration of the validator
-
- public ValidationPlugin() {
- super();
- if (_plugin == null)_plugin = this;
- }
-
- /**
- * Answer the name of the bundle's property file.
- *
- * @deprecated Use getBundlePropertyFileName() instead.
- */
- public static String getBundleName() {
- return getBundlePropertyFileName();
- }
-
- /**
- * Answer the name of the bundle's property file.
- */
- public static String getBundlePropertyFileName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static Message getMessage() {
- if (_message == null) {
- _message = new Message();
- _message.setBundleName(getBundlePropertyFileName());
- }
- // clear the message for reuse
- _message.setId(null);
- _message.setParams(null);
- _message.setTargetObject(null);
- _message.setGroupName(null);
- _message.setSeverity(IMessage.LOW_SEVERITY);
- return _message;
- }
-
- public static ValidationPlugin getPlugin() {
- return _plugin;
- }
-
- public static boolean isActivated() {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
- return false;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(EventManager.getManager(),
- IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE |
- IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_CHANGE);
-
- DependencyIndex di = (DependencyIndex)ValidationFramework.getDefault().getDependencyIndex();
- IWorkspace ws = ResourcesPlugin.getWorkspace();
- ws.addSaveParticipant(this, di);
-// ws.addResourceChangeListener(ValOperationManager.getDefault(),
-// IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD);
-
- }
-
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener( EventManager.getManager() );
-// ResourcesPlugin.getWorkspace().removeResourceChangeListener( ValOperationManager.getDefault() );
- EventManager.getManager().shutdown();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public static IEclipsePreferences getPreferences(IProject project){
- IScopeContext projectContext = new ProjectScope(project);
- return projectContext.getNode(PLUGIN_ID);
- }
-
- /**
- * Write this exception to the log.
- * <p>
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param e the throwable, this can be null in which case it is a nop.
- */
- public void handleException(Throwable e){
- handleException(e, IStatus.ERROR);
- }
-
- /**
- * Write this exception to the log.
- * <p>
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param e the throwable, this can be null in which case it is a nop.
- * @param severity the severity of the message. This must be one of the IStatus severities.
- */
- public void handleException(Throwable e, int severity){
- if (e == null)return;
- Status status = new Status(severity, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
- public void handleProjectUnavailableError(ProjectUnavailableError e){
- if (Tracing.isLogging())handleException(e);
- }
-
- public void handleResourceUnavailableError(ResourceUnavailableError e){
- if (Tracing.isLogging())handleException(e);
- }
-
- /**
- * 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/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
deleted file mode 100644
index caa4614..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.provisional;
-
-import org.eclipse.wst.validation.internal.ValidationFactoryImpl;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * This interface provides a way to access an instance of the ValidationFactoryImpl
- * instance, an internal implementation that provides access to some of the internal state
- * of validators.
- *
- * @plannedfor 1.0
- *
- * [issue: LM - 2 issues.
- * 1. I don't think the name 'factory' provides a good description of
- * this interface. Unless I'm mistaken the ValidationFactory doesn't
- * actually create validators but simply returns existing validators.
- * Looking at the implementation this is currently the case. I suggest
- * renaming this to ValidatorRegistry or something similar.
- * 2. I think the common way for creating a factory is to create a class
- * with a static method such as getFactory. If this is to be a factory
- * it should probably be structured as per the convention.]
- */
-public interface ValidationFactory {
-
- ValidationFactory instance = ValidationFactoryImpl.getInstance();
- /**
- * This api returns the IValidator given the validatorUniqueName id. The unique
- * id name is the class name that is defined in the class name element in the
- * plugin extension of the validator.
- * @param validatorUniqueId
- * @return IValidator
- * @plannedfor WTP 1.0
- */
- public IValidator getValidator(String validatorUniqueId) throws InstantiationException;
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
deleted file mode 100644
index dacb599..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
+++ /dev/null
@@ -1,25 +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.core;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-public class EmptySchedulingRule implements ISchedulingRule {
-
- public boolean contains(ISchedulingRule rule)
- {
- return rule == this;
- }
-
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
deleted file mode 100644
index 04e6ba7..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
+++ /dev/null
@@ -1,84 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-
-/**
- * <p>
- * Default implementation of the IFileDelta
- * </p>
- *
- * @see org.eclipse.wst.validation.internal.core.IFileDelta
- *
- * [issue: CS - is there a reason that we need to expose this impl class as an API?
- * It would seem better to only expose IFileDelta. I can't think of a reason where
- * a typical client would need to create one of these.]
- */
-public class FileDelta implements IFileDelta {
- private int fileDelta;
- private String fileName;
-
- /**
- * <p>
- * Creates a default instance of the FileDelta
- * </p>
- */
- public FileDelta() {
- super();
- }
-
- /**
- * <p>
- * Constructor is used to initialize the fields.
- * </p>
- *
- * @param aFileName specifies the file name
- * @param aFileDelta specifies the
- */
- public FileDelta(String aFileName, int aFileDelta) {
- fileName = aFileName;
- fileDelta = aFileDelta;
- }
-
- /**
- * @see IFileDelta#getDeltaType()
- */
- public int getDeltaType() {
- return fileDelta;
- }
-
- /**
- * @see IFileDelta#getFileName()
- */
- public String getFileName() {
- return fileName;
- }
-
- /**
- * <p>
- * Set the flag which indicates the type of change that the file
- * has undergone.
- * </p>
- */
- public void setDeltaType(int deltaType) {
- fileDelta = deltaType;
- }
-
- /**
- * <p>
- * Set the name of the file which has changed.
- * </p>
- */
- public void setFileName(String aFileName) {
- fileName = aFileName;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
deleted file mode 100644
index b848eed..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
+++ /dev/null
@@ -1,65 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-/**
- * <p>
- * This interface is used, for incremental validation, to encapsulate the change
- * status of a resource. IFileDelta contains the name of the file which has
- * changed, and a flag which indicates the type of change which has occurred.
- *
- * @plannedfor 1.0
- * </p>
- * [issue: LM - From speaking with Vijay the name IFileDelta doesn't really capture
- * what this interface is for. Validation may occur of files, it may occur on resources,
- * or it may occur on something more abstract simply known as an artifact. The delta part
- * of the name also seems misleading as this interface doesn't provide the delta but
- * rather provides the type of change. I suggest renaming this interface to IModifiedArtifact
- * or something along those lines to better capture its use. ]
- */
-public interface IFileDelta {
-
- /** 1 - the file has been added */
- int ADDED = 1;
-
- /** 2 - the file has been changed */
- int CHANGED = 2;
-
- /** 3 - the file has been deleted */
- int DELETED = 3;
-
- /**
- * <p>
- * Returns the flag which indicates the type of change which has occurred:
- * IFileDelta.ADDED, IFileDelta.CHANGED, or IFileDelta.DELETED.
- * </p>
- * @return returns the delta type.
- * @plannedfor WTP 1.0
- *
- * [issue: LM - From my experience a validator simply needs to know what artifact needs
- * to be validated. Can you provide a use case where the type of change is needed for
- * validation? ]
- */
- int getDeltaType();
-
- /**
- * <p>
- * Returns the name of the eclipse resource file which has changed. The return value must not be
- * null or the empty string ("").
- * </p>
- * @return returns the file name.
- * @plannedfor WTP 1.0
- *
- * [issue: LM - Following my comments above this method should be renamed to getArtifactName or
- * something that follows along with the interface rename. ]
- */
- String getFileName();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
deleted file mode 100644
index af85f64..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.List;
-import java.util.Locale;
-
-
-/**
- * <p>
- * Interface which can be used to access messages which are stored within a reporter which retains
- * its message history.
- * </p>
- *
- * [issue: CS - This interface seems like overkill. I'd think that an IReport should simply have a getMessages() method.
- * I think MessageFiltering should take place at the 'display' level and not at this level of the API.]
- */
-public interface IMessageAccess {
- /**
- * @param filter
- * A filter which specifies a subset of messages to retrieve. null specifies, "all
- * messages".
- * @return List list of messages related to the target object
- */
- abstract List getMessages(MessageFilter filter);
-
- /**
- * @param filter
- * A filter which specifies a subset of messages to retrieve. null specifies, "all
- * messages".
- * @param locale
- * The target local to translate the messages into. null specifies, "use default
- * locale".
- * @return List a list of messages related to the target object, translated into the specified
- * locale.
- */
- abstract List getMessagesAsText(MessageFilter filter, Locale targetLocale);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
deleted file mode 100644
index 8998112..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
+++ /dev/null
@@ -1,398 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * <p>
- * Default implementation of the IMessage interface, provided for the convenience of the
- * IValidators. If an IValidator needs to run in both AAT and WSAD then this IMessage implementation
- * should be used; if the IValidator runs in WSAD alone, the WSAD LocalizedMessage may be used in
- * place of this implementation.
- * <p>
- * @see org.eclipse.wst.validation.internal.provisional.core.IMessage
- *
- * [issue: CS - I'd suggest splitting this class into Message and BundleMessage (where the latter inherits
- * from the former. We have many messages that come (from xerces) pretranslated and don't require 'bundle'
- * related fields and methods. Splitting this class would make it easier to understand where bundle related
- * function is coming into play. Below I've listed out what would go into BundleMessage to demonstrate how
- * we can simplify the 'Message' class by factoring out the bundle related details.
- *
- * Message
- * private Object targetObject = null;
- * private String groupName = null;
- * private int lineNumber = IMessage.LINENO_UNSET;
- * private int length = IMessage.OFFSET_UNSET;
- * private int offset = IMessage.OFFSET_UNSET;
- *
- *
- * BundleMessage
- * private String id = null;
- * private String[] params = null;
- * private String bundleName = null;
- *
- * - getId()
- * - getBundle(...)
- * - getBundleName()
- * - getParams()
- * - getText(Locale)
- * - getText(ClassLoader)
- * - getText(Locale, ClassLoader)
- * - setId(String)
- * - setBundleName(String)
- * - setParams(String[])
- * ]
- */
-public class Message implements IMessage {
- private String id;
- private String[] params;
- private int severity = MessageFilter.ANY_SEVERITY;
- private Object targetObject;
- private String bundleName;
- private String groupName;
- private int lineNumber = IMessage.LINENO_UNSET;
- private int length = IMessage.OFFSET_UNSET;
- private int offset = IMessage.OFFSET_UNSET;
- private HashMap<String, Object> messageAttributes;
- private String markerId;
-
- /**
- * <p>
- * Creates a default instance of the Message
- * </p>
- */
- public Message() {
- super();
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity and a unique id
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- */
- public Message(String aBundleName, int aSeverity, String anId) {
- this(aBundleName, aSeverity, anId, null, null);
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity, a unique id, and
- * a list of parameters.
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- * @param aParams
- * May be null, if there are no parameters in the message.
- */
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams) {
- this(aBundleName, aSeverity, anId, aParams, null);
- }
-
- /**
- * <p>
- * Creates a Message object with bundle name, severity, a unique id, and
- * a list of parameters and the target object.
- * </p>
- *
- * @param aBundleName
- * Must not be null or the empty string ("").
- * @param aSeverity
- * Must be one of the severities specified in IMessage.
- * @param anId
- * Must not be null or the empty string ("").
- * @param aParams
- * May be null, if there are no parameters in the message.
- * @param targetObject
- * May be null, if the message does not pertain to a particular
- * object.
- */
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject) {
- bundleName = aBundleName;
- severity = aSeverity;
- id = anId;
- params = aParams;
- targetObject = aTargetObject;
- }
-
- public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject, String aGroupName) {
- bundleName = aBundleName;
- severity = aSeverity;
- id = anId;
- params = aParams;
- targetObject = aTargetObject;
- groupName = aGroupName;
- }
-
- /**
- * @return the resource bundle which contains the messages, as identified by
- *
- * @link #getBundleName()
- */
- public ResourceBundle getBundle(Locale locale, ClassLoader classLoader) {
- ResourceBundle bundle = null;
- try {
- if (classLoader == null) {
- bundle = ResourceBundle.getBundle(getBundleName(), locale);
- } else {
- bundle = ResourceBundle.getBundle(getBundleName(), locale, classLoader);
- }
- } catch (MissingResourceException e) {
- //try to load the bundle from the validation framework plugin
- bundle = getFrameworkBundle(locale);
- }
- return bundle;
- }
-
- private ResourceBundle getFrameworkBundle(Locale locale) {
- ResourceBundle bundle = null;
- try {
- bundle = ResourceBundle.getBundle(getBundleName(), locale, this.getClass().getClassLoader());
-
- } catch (MissingResourceException e) {
- e.printStackTrace();
- }
- return bundle;
- }
-
- /**
- * @see IMessage#getBundleName()
- */
- public String getBundleName() {
- return bundleName;
- }
-
- /**
- * @see IMessage#getGroupName()
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * @see IMessage#getId()
- */
- public String getId() {
- return id;
- }
-
- /**
- * @see IMessage#getLength()
- */
- public int getLength() {
- return length;
- }
-
- /**
- * @see IMessage#getLineNumber()
- */
- public int getLineNumber() {
- return lineNumber;
- }
-
- /**
- * @see IMessage#getOffset()
- */
- public int getOffset() {
- return offset;
- }
-
- /**
- * @see IMessage#getParams()
- */
- public String[] getParams() {
- return params;
- }
-
- /**
- * @see IMessage#getSeverity()
- */
- public int getSeverity() {
- return severity;
- }
-
- /**
- * @see IMessage#getTargetObject()
- */
- public Object getTargetObject() {
- return targetObject;
- }
-
- /**
- * @see IMessage#getText()
- */
- public String getText() {
- return getText(Locale.getDefault(), null);
- }
-
- /**
- * @see IMessage#getText(ClassLoader)
- */
- public String getText(ClassLoader classLoader) {
- return getText(Locale.getDefault(), classLoader);
- }
-
- /**
- * @see IMessage#getText(Locale)
- */
- public String getText(Locale locale) {
- return getText(locale, null);
- }
-
- /**
- * @see IMessage#getText(Locale, ClassLoader)
- */
- public java.lang.String getText(Locale locale, ClassLoader classLoader) {
- String message = ""; //$NON-NLS-1$
-
- if (locale == null) {
- return message;
- }
-
- ResourceBundle bundle = getBundle(locale, classLoader);
- if (bundle == null) {
- return message;
- }
-
- try {
- message = bundle.getString(getId());
-
- if (getParams() != null) {
- message = java.text.MessageFormat.format(message, (Object[])getParams());
- }
- } catch (MissingResourceException exc) {
- System.err.println(exc.getMessage());
- System.err.println(getId());
- } catch (NullPointerException exc) {
- System.err.println(exc.getMessage());
- System.err.println(getId());
- }
-
- return message;
- }
-
- /**
- * @see IMessage#setBundleName(String)
- */
- public void setBundleName(String aBundleName) {
- bundleName = aBundleName;
- }
-
- /**
- * @see IMessage#setGroupName(String)
- */
- public void setGroupName(String name) {
- groupName = name;
- }
-
- /**
- * @see IMessage#setId(String)
- */
- public void setId(String newId) {
- id = newId;
- }
-
- /**
- * @see IMessage#setLength(int)
- */
- public void setLength(int length) {
- if (length < 0) {
- length = IMessage.OFFSET_UNSET;
- }
- this.length = length;
- }
-
- /**
- * @see IMessage#setLineNo(int)
- */
- public void setLineNo(int lineNumber) {
- if (lineNumber < 0) {
- this.lineNumber = IMessage.LINENO_UNSET;
- } else {
- this.lineNumber = lineNumber;
- }
- }
-
- /**
- * @see IMessage#setOffset(int)
- */
- public void setOffset(int offset) {
- if (offset < 0) {
- offset = IMessage.OFFSET_UNSET;
- }
- this.offset = offset;
- }
-
- /**
- * @see IMessage#setParams(String[])
- */
- public void setParams(String[] newParams) {
- params = newParams;
- }
-
- /**
- * @see IMessage#setSeverity(int)
- */
- public void setSeverity(int newSeverity) {
- severity = newSeverity;
- }
-
- /**
- * @see IMessage#setTargetObject(Object)
- */
- public void setTargetObject(Object obj) {
- targetObject = obj;
- }
-
- public Object getAttribute(String attributeName) {
- if(messageAttributes != null) {
- return messageAttributes.get(attributeName);
- }
- return null;
- }
-
- public void setAttribute(String attributeName, Object value) {
- if(messageAttributes == null) {
- messageAttributes = new HashMap<String, Object>();
- }
- messageAttributes.put(attributeName,value);
- }
-
- public HashMap<String,Object> getAttributes() {
- return messageAttributes;
- }
-
- public String getMarkerId() {
- return markerId;
- }
-
- public void setMarkerId(String markerId) {
- this.markerId = markerId;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
deleted file mode 100644
index a8e97a3..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
+++ /dev/null
@@ -1,129 +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.core;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-
-/**
- * <p>
- * Encapsulates common message filtering parameters. Message Filters are used when retrieving
- * messages via an IMessageAccess. The filter encapsulates a simple set of typical filter criteria
- * which is used to select a subset of messages to retrieve. If multiple attributes of the message
- * filter are specified, they should be logically AND'd together by the MessageAccess
- * implementation.
- * </p>
- */
-public class MessageFilter {
- public static final int ANY_SEVERITY = -1;
-
- /**
- * <p>
- * Messages matching this severity(s) will be retrieved. One of SeverityEnum XXX_severity
- * constants, or ANY_SEVERITY to specify that messages of any severity will be returned. This
- * field can be combined with other filter attributes to narrow the selection set further.
- * </p>
- */
- private int severity = ANY_SEVERITY;
-
- /**
- * <p>
- * The validator which reported the messages that should be returned. All messages which were
- * reported using validator matching this validator will be returned. This field can be combined
- * with other filter attributes to narrow the selection set further.
- * </p>
- */
- private IValidator validator;
-
- /**
- * <p>
- * The target object of the messages that should be returned, or null to specify to retrieve
- * messages of any target. All messages having a target object matching this object will be
- * returned. This field can be combined with other filter attributes to narrow the selection set
- * further.
- * </p>
- */
- private Object targetObject;
-
- /**
- * @deprecated
- */
- public MessageFilter() {
- super();
- }
-
- /**
- *
- * @param aSeverity
- * Severity of the message
- * @param validator
- * IValidator which reported the message
- * @param aTargetObject
- * Target object of the message
- */
- public MessageFilter(int aSeverity, IValidator validator, Object aTargetObject) {
- super();
- severity = aSeverity;
- this.validator = validator;
- targetObject = aTargetObject;
- }
-
- /**
- * @return the severity filter constraint.
- */
- public int getSeverity() {
- return severity;
- }
-
- /**
- * @return the target object filter constraint.
- */
- public java.lang.Object getTargetObject() {
- return targetObject;
- }
-
- /**
- * @return the validator to filter on.
- */
- public IValidator getValidator() {
- return validator;
- }
-
- /**
- * Set the severity filter constraint.
- *
- * @param newSeverity
- * severity filter constraint
- */
- public void setSeverity(int newSeverity) {
- severity = newSeverity;
- }
-
- /**
- * Set the target object filter constraint.
- *
- * @param newTargetObject
- * target object filter constraint
- */
- public void setTargetObject(java.lang.Object newTargetObject) {
- targetObject = newTargetObject;
- }
-
- /**
- * Set the validator to return messages for.
- *
- * @param validator
- * validator to return messages for
- */
- public void setValidator(IValidator validator) {
- this.validator = validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
deleted file mode 100644
index f8970a7..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
+++ /dev/null
@@ -1,165 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.core;
-
-
-import java.util.Locale;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * <p>
- * This exception is the only exception which should be thrown by IValidators. The message in this
- * exception must be suitable for showing to the user. All ValidationExceptions will have their
- * message extracted when they're caught, and the message will be shown to the user.
- *
- * @plannedfor 1.0
- * </p>
- */
-public class ValidationException extends Exception {
- private Throwable _lowLevelException;
- private IMessage _message;
- private ClassLoader _loader;
- private final static long serialVersionUID = -3387516993124229949L;
-
-
-
- /**
- * Constructs a new exception with a given message string. <br>
- * <br>
- *
- * @param message
- * IMessage, which is Locale-independent, which contains the message to be shown to
- * be shown to the user.
- */
- public ValidationException(IMessage message) {
- this(message, null);
- }
-
- /**
- * Constructs a new exception with a given message string, and low-level exception. <br>
- * <br>
- *
- * @param message
- * IMessage Locale-independent message to be shown to the user.
- * @param exception
- * relevant low-level exception, or <code>null</code> if none. <br>
- *   For example, when a method fails because of a network
- * communications   problem, this would be the
- * <code>java.io.IOException</code>   describing the exact nature
- * of the problem.
- */
- public ValidationException(IMessage message, Throwable exception) {
- super();
- _message = message;
- _lowLevelException = exception;
- }
-
- /**
- * @return the low-level exception associated with this ValidationException.
- */
- public Throwable getAssociatedException() {
- return _lowLevelException;
- }
-
- /**
- * @return the IMessage to be shown to the user, or null if this exception should be handled
- * internally.
- */
- public IMessage getAssociatedMessage() {
- return _message;
- }
-
- /**
- * @return if the IValidator which threw this exception was loaded by a different ClassLoader than the
- * framework, this method returns the ClassLoader of the IValidator.
- */
- public ClassLoader getClassLoader() {
- return _loader;
- }
-
- /**
- * @return the error message string of this <code>Throwable</code> object if it was
- * {@link java.lang.Throwable#Throwable(String) created}with an error message string;
- * or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
- * no error message.
- *
- */
- public String getMessage() {
- return _message.getText(getClassLoader());
- }
-
- /**
- * @param locale
- * The locale of which to get the message.
- * @return the error message string of this <code>Throwable</code> object if it was
- * {@link java.lang.Throwable#Throwable(String) created}with an error message string;
- * or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
- * no error message.
- */
- public String getMessage(Locale locale) {
- return _message.getText(locale, getClassLoader());
- }
-
- /**
- * <p>
- * If the IValidator which threw this exception was loaded by a different ClassLoader than the
- * framework, this method should set the ClassLoader to be the ClassLoader of the IValidator.
- * </p>
- * @param loader
- * ClassLoader of the validator
- */
- public void setClassLoader(ClassLoader loader) {
- _loader = loader;
- }
-
- /**
- * <p>
- * Returns a short description of this throwable object. If this <code>Throwable</code> object
- * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
- * the result is the concatenation of three strings:
- * <ul>
- * <li>The name of the actual class of this object
- * <li>": " (a colon and a space)
- * <li>The result of the {@link #getMessage}method for this object
- * </ul>
- * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
- * with no error message string, then the name of the actual class of this object is returned.
- * </p>
- *
- * @return a string representation of this <code>Throwable</code>.
- */
- public String toString() {
- return toString(Locale.getDefault());
- }
-
- /**
- * <p>
- * Returns a short description of this throwable object. If this <code>Throwable</code> object
- * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
- * the result is the concatenation of three strings:
- * <ul>
- * <li>The name of the actual class of this object
- * <li>": " (a colon and a space)
- * <li>The result of the {@link #getMessage}method for this object
- * </ul>
- * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
- * with no error message string, then the name of the actual class of this object is returned.
- * </p>
- *
- * @return a string representation of this <code>Throwable</code>.
- */
- public String toString(Locale locale) {
- String s = getClass().getName();
- String message = getMessage(locale);
- return (message != null) ? (s + ": " + message) : s; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
deleted file mode 100644
index f053410..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
+++ /dev/null
@@ -1,107 +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.core;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.internal.TaskListUtility;
-import org.eclipse.wst.validation.internal.operations.MessageInfo;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * This singleton launches the validation on a single validator. Clients should call this class's
- * <code>start</code> method to begin the validation.
- */
-public class ValidatorLauncher {
- private static ValidatorLauncher _launcher;
-
- private ValidatorLauncher() {
- }
-
- /**
- * @return the singleton launcher.
- */
- public static ValidatorLauncher getLauncher() {
- if (_launcher == null) {
- _launcher = new ValidatorLauncher();
- }
- return _launcher;
- }
-
- /**
- * <p>
- * This method is the launch point of the validation. It runs validation on the validator
- * accessed by the IValidationContext. When the validation is complete, each validator may perform resource
- * cleanup, if necessary.
- * <p>
- * If <code>helper</code>,<code>validator</code>, or <code>reporter</code> are null,
- * validation is not performed. <code>changedFiles</code> may be null, or empty, if a full
- * build should be done.
- * </p>
- *
- * @param helper
- * loads an object.
- * @param validator
- * validator object to launch validation.
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the user.
- */
- public void start(final IValidationContext helper, final IValidator validator, final IReporter reporter) throws ValidationException {
- if ((helper == null) || (validator == null) || (reporter == null))return;
-
- // Can't force each validator to check if it's cancelled or not,
- // so check for cancellation here. Hopefully the user won't wait too long.
- if (reporter.isCancelled())return;
-
-
- // If the validator is about to perform a full build, remove all of its previous validation
- // messages.
- if ((helper.getURIs() == null) || (helper.getURIs().length == 0)) {
- reporter.removeAllMessages(validator);
- }
- if( validator instanceof IValidatorJob ){
- ((IValidatorJob)validator).validateInJob(helper, reporter);
- }else{
- validator.validate(helper, reporter);
- }
- if( validator instanceof IValidatorJob ){
- //the validators who have implemented IValidatorJob but are running synchronously
- //would log messages now ...
- ValidatorManager mgr = ValidatorManager.getManager();
- final List list = mgr.getMessages((IValidatorJob)validator);
-
- Iterator it = list.iterator();
- while( it.hasNext() ){
- MessageInfo info = (MessageInfo)it.next();
- try {
- TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
- info.getLocation(), info.getMsg().getId(), info.getText(),
- info.getMsg().getSeverity(), info.getMarkerId(),
- info.getTargetObjectName(),
- info.getMsg().getGroupName(), info.getMsg().getOffset(), info.getMsg().getLength());
-
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- mgr.clearMessages( (IValidatorJob)validator );
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
deleted file mode 100644
index 5550942..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
+++ /dev/null
@@ -1,346 +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.provisional.core;
-
-
-import java.util.HashMap;
-import java.util.Locale;
-
-/**
- * <p>
- * This interface represents a locale-independent validation message.
- * </p>
- * <p>
- * Given these three values as input, this interface can be queried for the final message string.
- * (i.e., the message with the parameters already substituted in.) Either the default Locale can be
- * used, or the caller can specify a Locale.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IMessage {
- /*
- *
- * [issue: CS - The 'IMessage' interface would be simpler without the bundle related details. I'd like to understand
- * why we can 'precompute' the translated message. Is there some benefit to perform 'late computation' of these messages?
- * How does this compare to the eclipse Marker (as far as I know the Marker's text() is preLocalized).
- * Here's a list of the methods that are related to 'bundle specific' aspects and could be separate out (or designed away)?
- *
- * - getId()
- * - getBundle(...)
- * - getBundleName()
- * - getParams()
- * - getText(Locale)
- * - getText(ClassLoader)
- * - getText(Locale, ClassLoader)
- * - setId(String)
- * - setBundleName(String)
- * - setParams(String[])
- * ]
- *
- * - void setAttribute(String attributeName, Object value)
- * - Object getAttribute(String attributeName);
- * ]
- */
- int OFFSET_UNSET = -1; // see getLength(), getOffset()
- int LINENO_UNSET = 0;
-
- /**
- * Typically used to specify error messages.
- */
- int HIGH_SEVERITY = 0x0001;
- /**
- * Typically used to specify warning messages.
- */
- int NORMAL_SEVERITY = 0x0002;
- /**
- * Typically used to specify information messages.
- */
- int LOW_SEVERITY = 0x0004;
- /**
- * Specify high (error) and normal (warning) messages. Typically used with a MessageFilter, to
- * filter out information messages.
- */
- int ERROR_AND_WARNING = HIGH_SEVERITY | NORMAL_SEVERITY;
- /**
- * Specify all types of messages. Typically used with a MessageFilter.
- */
- int ALL_MESSAGES = ERROR_AND_WARNING | LOW_SEVERITY;
-
- /**
- * TargetResource - The key to use when associating a resource with a message via an
- * attribute.
- * <p>
- * Normally, the target is stored using the setTargetObject() method, but
- * some of the legacy validators used this field for objects that where not IResources.
- * In order to associate the message with the proper IResource the validator can store
- * the IResource as an attribute and use this string as the key.
- * </p>
- */
- String TargetResource = "TargetResource"; //$NON-NLS-1$
-
- /**
- * @return the name of the bundle which this message is contained in.
- */
- String getBundleName();
-
- /**
- * To support removal of a subset of validation messages, an IValidator may assign group names
- * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
- * means no group.
- *
- * @return the name of the group to which the message belongs.
- */
- String getGroupName();
-
- /**
- * Returns the id of the message. Message ids are used as the constants in property bundles
- * which localize the description of the message in a locale-independent fashion. The id is the
- * key, in the resource bundle, which identifies the string to be loaded. The id may not be null
- * or the empty string.
- *
- * @return the id of the message
- */
- String getId();
-
- /**
- * @return the length of the problem area, starting from the offset. If unset, value =
- * IMessage.OFFSET_UNSET.
- *
- * @see #getOffset()
- */
- int getLength();
-
- /**
- * If there is a target object associated with this IMessage, and that target object is a file,
- * then an optional line number may be set. The line number identifies the location of the
- * problem identified by this message. If no line number has been set, #LINENO_UNSET will be
- * returned.
- *
- * @return line number of the location of the problem.
- */
- int getLineNumber();
-
- /**
- * Returns the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if
- * the java compiler were a validator, and it reported that a variable name was unknown, offset
- * would identify the position of the first character of the unknown variable. The position is
- * identified by the number of characters from the start of the file.
- *
- * @return offset of the message
- */
- int getOffset();
-
- /**
- * Returns the parameters of the message. Message parameters are the values which are
- * substituted into parameter slots in localized message text descriptions.
- *
- * @return parameters of the message
- */
- String[] getParams();
-
- /**
- * <p>
- * Returns the severity level of the message. One of SeverityEnum constants.
- *
- * @see IMessage#HIGH_SEVERITY
- * @see IMessage#NORMAL_SEVERITY
- * @see IMessage#LOW_SEVERITY
- * </p>
- *
- * @return the severity level of the message
- */
- int getSeverity();
-
- /**
- * Return the object that this IMessage is reporting the problem against, if any. null will be
- * returned if this is a general message which does not apply to a particular object; for
- * example, "internal error".
- *
- * @return the target object for the message
- */
- Object getTargetObject();
-
- /**
- * @return a text representation of this message formatted in the default Locale, with the
- * bundle loaded by the default ClassLoader.
- */
- String getText();
-
- /**
- * @param classLoader
- * The ClassLoader which will be used to load the ResourceBundle.
- *
- * @return a text representation of this message formatted in the default locale, with the
- * bundle loaded by the specified ClassLoader.
- */
- String getText(ClassLoader classLoader);
-
- /**
- * @param locale
- * The locale to translate the message text into.
- *
- * @return a text representation of this message formatted in the specified locale, with the
- * bundle loaded by the default ClassLoader.
- */
- String getText(Locale locale);
-
- /**
- * @param locale
- * The locale to translate the message text into.
- * @param classLoader
- * The ClassLoader which will be used to load the ResourceBundle.
- *
- * @return a text representation of this message formatted in the specified locale, with the
- * bundle loaded by the specified ClassLoader.
- */
- String getText(Locale locale, ClassLoader classLoader);
-
- /**
- * Provides a way to store some additional attributes that a message would like to store
- * that can used by some other parties that are interested in those attribute values.
- *
- * @param attributeName
- * @return an Object basically the value associated with the object name.
- */
-
- Object getAttribute(String attributeName);
-
- /**
- * Set the attributeName and value as key value pair.
- *
- * @see #getAttribute(String attributeName)
- * @param attributeName
- */
-
- void setAttribute(String attributeName, Object value);
-
-
- /**
- * Set the name of the bundle which this message is contained in.
- *
- * @param bundleName
- * Name of the bundle which contains the message.
- */
- void setBundleName(String bundleName);
-
- /**
- * To support removal of a subset of validation messages, an IValidator may assign group names
- * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
- * means no group.
- *
- * @param name
- * Name of the group.
- */
- void setGroupName(String name);
-
- /**
- * Set the id of the message. Message ids are used as the constants in property bundles which
- * localize the description of the message in a locale-independent fashion. The id is the key,
- * in the resource bundle, which identifies the string to be loaded. The id may not be null or
- * the empty string.
- *
- * @param newId
- * Id of the message.
- */
- void setId(String newId);
-
- /**
- * Sets the length of the problem, starting from the offset. If unset, value =
- * IMessage.OFFSET_UNSET.
- *
- * @see #setOffset(int)
- *
- * @param length
- * Sets the length.
- */
- void setLength(int length);
-
- /**
- * If there is a target object associated with this IMessage, and that target object is a file,
- * then an optional line number may be set. The line number identifies the location of the
- * problem identified by this message. To indicate no line number, use #LINENO_UNSET.
- *
- * @param lineNumber
- * Sets the line number.
- */
- void setLineNo(int lineNumber);
-
- /**
- * Sets the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if the
- * java compiler were a validator, and it reported that a variable name was unknown, offset
- * would identify the position of the first character of the unknown variable. The position is
- * identified by the number of characters from the start of the file.
- *
- * @param offset
- * Sets the offset of the message.
- */
- void setOffset(int offset);
-
- /**
- * Sets the parameters of the message. Message parameters are the values which are substituted
- * into parameter slots in localized message text descriptions.
- * <p>
- * For example, if getId() returns "MY_ID", then the ResourceBundle identified by
- * getBundleName() is searched for the message named "MY_ID", and if found,
- * has it's parameters set.
- * </p>
- *
- * @see java.text.MessageFormat#format(String, Object[]) is invoked on the message, with
- * <code>newParams</code> passed in as the Object[].
- *
- * @param newParams
- * Parameters of the message.
- */
- void setParams(String[] newParams);
-
- /**
- * Sets the severity level of the message. One of SeverityEnum constants.
- *
- * @see IMessage#HIGH_SEVERITY
- * @see IMessage#NORMAL_SEVERITY
- * @see IMessage#LOW_SEVERITY
- *
- * @param newSeverity
- * Severity level of the message.
- */
- void setSeverity(int newSeverity);
-
- /**
- * Associate this IMessage with the object that has the problem. A null value is permitted. If a
- * message is applicable to one object, then this value should be set. Otherwise, the default
- * value (null) should be kept. Given this target object, it should be possible to calculate the
- * exact location of the problem.
- *
- * @param obj
- * The object that has the problem.
- */
- void setTargetObject(Object obj);
-
- /**
- * Return all the attributes of a Message object.
- */
- HashMap getAttributes();
-
- /**
- * Return the marker id if one is set on this object when created.
- */
- String getMarkerId();
-
- /**
- * Set the marker id on a Message object.
- */
- void setMarkerId(String markerId);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
deleted file mode 100644
index 1ffef39..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.provisional.core;
-
-/**
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IMetaModelContext extends IValidationContext {
-
- public Object getModel(String URI);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
deleted file mode 100644
index 4210353..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * IProjectValidationContext extends IValidationContext to provide access to a
- * reference to the project on which a validator is being invoked.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IProjectValidationContext extends IValidationContext
-{
- /**
- * Provides the project on which the validator is being invoked.
- *
- * @return an IProject reference to the project on which the validator is
- * being invoked.
- */
- IProject getProject();
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
deleted file mode 100644
index 3005139..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
+++ /dev/null
@@ -1,162 +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.provisional.core;
-
-import java.util.List;
-
-/*
- * CCM - Reporter is now passed locale-independent messages.
- * Messages should only be translated to a locale upon access.
- * Or in special locale-dependent reporter implementations (console logger).
- */
-
-/**
- * The interface used by IValidator's to report messages. The implementation of the IReporter could
- * simply log the messages to stdout, a file, or retain them in a buffer for later access by a user
- * interface.
- * <p>
- * Reporter implementations should keep non-localized versions of their messages.
- * </p>
- * <p>
- * Any messages which need to be displayed to the user are done through this class, and if the user
- * cancels the current function, this class is the one which registers the cancellation.
- * </p>
- * <p>
- * The IReporter instance is created at the time validation begins and ends when validation is complete.
- * There is only one IReporter instance created for all validators that are run on a IResource. The IResource
- * provides a way to get messages put out each validator and add and delete messages for one validator
- * at a time.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IReporter {
- /**
- * <p>
- * Add a locale-independent validation message. It will be displayed later, with all of the
- * other validation messages.
- * </p>
- * <p>
- * The IValidator passed in is needed for incremental validation (when a message needs to be
- * removed, one validator should not remove messages entered by another validator.) The
- * validator is also queried for information about its resource bundle, to enable support for
- * localization of messages in a client-server environment.
- * </p>
- * <p>
- * Both parameters must not be null.
- * </p>
- * @param origin
- * The validator which is the source of the message.
- * @param message
- * A message to be reported.
- */
- void addMessage(IValidator origin, IMessage message);
-
- /**
- * Show a text representation of this message, formatted in the default
- * Locale, to the user immediately. This message indicates which subtask is
- * currently being processed. The message is not stored. The subtask message
- * in this context is the subtask in a IProgressMontior
- * <p>
- * Both parameters must not be null.
- * </p>
- *
- * @param validator
- * The validator issuing the subtask message.
- * @param message
- * The message to be displayed to the user.
- *
- */
- void displaySubtask(IValidator validator, IMessage message);
-
- /**
- * @return the message access interface to this reporter, or null if message access is not
- * supported.
- *
- */
- List getMessages();
-
- /**
- * Return true if the user canceled validation, and false otherwise. This method should be
- * called by IValidators periodically, because no event is fired to notify IValidators that the
- * user canceled validation. If a validator does not check this method, a cancellation request
- * is ignored.
- *
- * @return true if the user canceled validation, and false otherwise.
- *
- */
- boolean isCancelled();
-
- /**
- * Remove all validation messages entered by the identified validator. This method is provided
- * for incremental validation.
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- * @param origin
- * Originator validator of the message.
- */
- void removeAllMessages(IValidator origin);
-
- /**
- * Remove all validation messages, entered by the identified validator,
- * pertaining to the Object provided. This method is provided for
- * incremental validation. <br>
- * <br>
- * If <code>object</code> is null, then this method should remove all
- * messages owned by the validator. (i.e., the same behaviour as the
- * removeAllMessages(IValidator) method.) <br>
- * <br>
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- *
- * @param origin
- * Originator validator of the message.
- * @param object
- * Object to which the message belongs. Object is the target object
- * that was set on the IMessage when adding the message as problem
- * marker.
- *
- */
- void removeAllMessages(IValidator origin, Object object);
-
- /**
- * To support removal of a subset of validation messages, an IValidator may
- * assign group names to IMessages. An IMessage subset will be identified by
- * the name of its group. This method will remove only the IMessage's that
- * are in the group identified by groupName.
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- * <p>
- * If <code>object</code> is null, then this method should remove all
- * messages owned by the validator. (i.e., the same behaviour as the
- * removeAllMessages(IValidator) method.)
- * </p>
- * <p>
- * If groupName is null, that's the same as no group (i.e., the same
- * behaviour as the <code>removeAllMessages(IValidator, Object)</code>
- * method.)
- * </p>
- *
- * @param validator
- * Originator validator of the message.
- * @param obj
- * Object to which the message belongs.
- * @param groupName
- * Name of the group to which the message belongs.
- */
- void removeMessageSubset(IValidator validator, Object obj, String groupName);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
deleted file mode 100644
index 54a8ce5..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
+++ /dev/null
@@ -1,90 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-/**
- * This class is used to to separate the IValidator from the model loading. A model
- * is a group of object(s) that must follow some rules.
- * <p>
- * The model is loaded differently depending on whether the validator is running in
- * as-you-type or builder based context. If the <code>loadModel</code> method was a method on the IValidator,
- * then there would need to be two versions of validators, one for as-you-type and one for
- * builder based. Because <code>loadModel</code> is separate from the IValidator, we provide
- * two different IHelpers instead, and ship the one specific to the environment.
- * </p>
- * <p>
- * Each IValidationContext implementation loads a specific model as identified by a String
- * <code>symbolicName</code>. The symbolicName can be any value except null or the
- * empty string. Each validator identifies the symbolic names which it needs, and the
- * type of model which needs to be returned when that symbolic name is loaded via a
- * <code>loadModel</code> method. An IValidationContext can support more than one IValidator;
- * the helper needs to support every model that each validator needs.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IValidationContext {
- /**
- * <p>
- * Load the model identified by <code>symbolicName</code>. <code>symbolicName</code>
- * must not be null or the empty string if the validator needs to be run in both
- * as-you-type and builder based validation.
- * </p>
- * <p>
- * The symbolicName is a string name that is registered in the implementation of the
- * IValidatorContext. For an example our internal implementation of the loadModel use
- * method names for symbolicNames to load the model object to be validated. Users can
- * use their own model load mechanism.
- * </p>
- *
- * @see <code>WorkbenchContext</code>
- */
- Object loadModel(String symbolicName);
-
- /*
- *
- * [issue : CS - It's not at all clear how these parameters would get passed into a helper. I'd suggest
- * providing getProperty() and setProperty() methods on the class to allow contextual information to be
- * supplied and queried in a generic manner.]
- */
- /**
- * <p>
- * Load the model identified by <code>symbolicName</code> and <code>parms</code>.
- * <code>symbolicName</code> must not be null or the empty string if the validator
- * needs to be run in both as-you-type and builder based validation.
- * If <code>parms</code> is null then this
- * method behaves the same as
- *
- * @link #loadModel(String).
- *
- * This method differs from
- * @link #loadModel(String) because it takes parameters, from the IValidator, which
- * are available only at runtime. If you need to pass a live object to the IValidationContext,
- * this is the loadModel method to use.
- * </p>
- *
- * @param symbolicName String identifier for model.
- * @param parms List of parameters that the model takes for invocation.
- */
- Object loadModel(String symbolicName, Object[] parms);
-
- /**
- * @return a string array with the list of URI's that need to be validated in the
- * case of Incremental build.
- */
-
- String[] getURIs();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
deleted file mode 100644
index 6fbd55e..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
+++ /dev/null
@@ -1,74 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-/**
- * This is the base interface for all Validators. A Validator is a class which verifies that objects
- * follow some rules. For example, in a MOF model which represents an EJB jar, the EJB specification
- * determines the rules.
- * <p>
- * A validator can perform full validation or incremental validation. All validators must implement
- * full validation but incremental validation is optional.
- * </p>
- * <p>
- * Each validator must not be tied to any particular workbench implementation.
- * </p>
- * <p>
- * A validator's verification starts when the ValidatorLauncher singleton calls
- * <code>validate</code>.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IValidator{
-
- /*
- * [issue : CS - Perhaps the IValidator should be required to provide a 'name' that can be used describe
- * the running validation 'Job'. Then the framework could automatically say something like 'XYZ validator : cleanup'.
- * Relying on the IValidator to provide subtask information seems error prone.]
- * [issue: LM - Is the cleanup method necessary? Can the framework put a requirement that client validators 'clean up'
- * before returning from the validate method? ]
- */
-
- /**
- * Perform any resource cleanup once validation is complete. If cleanup will take some time, the
- * IValidator should report subtask information to the user through the IReporter parameter. The
- * IReporter parameter will not be null.
- *
- * @param reporter Used for the interaction with the user.
- */
- void cleanup(IReporter reporter);
-
- /*
- * [issue : CS - I'm curious to understand why the validator is not invoked directly on a file. It seems it should be the
- * domain of another API to manage manage incremental file changes and triggering validations accordingly.
- * Do we have a current use case in WTP where the validator does anything more validate a file from the changedFiles list?]
- */
- /**
- * This is the method which performs the validation on the objects.
- * <p>
- * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * </p>
- * @param helper
- * Loads an object.
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the user.
- *
- */
- void validate(IValidationContext helper, IReporter reporter) throws ValidationException;
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
deleted file mode 100644
index a25e7bb..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.provisional.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-/**
- * This is the Job interface for the validator. Validators implementing this interface are executed as
- * background jobs.
- * Following is a sequence of calls:
- * <ul>
- * <li>validator.getSchedulingRule(helper)
- * <li>validator.validate(reporter)
- * </ul>
- */
-public interface IValidatorJob extends IValidator{
-
- IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
-
-
-
- /**
- * This is the method which performs the validation on the objects.
- * <p>
- * <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * </p>
- *
- * @param reporter
- * Is an instance of an IReporter interface, which is used for interaction with the
- * user.
- * @param helper Will not be null, loads an object.
- */
- IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException;
-
- /**
- * Get the scheduling rule, which the framework applies to the Validator job.
- *
- * @param helper Will not be null, loads an object.
- */
- ISchedulingRule getSchedulingRule(IValidationContext helper);
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
deleted file mode 100644
index 3a86bf4..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
+++ /dev/null
@@ -1,30 +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.provisional.core;
-
-/*
- * [issue: LM - Going along with my comment on the addMessage method in IReporter I
- * think this class should be internal to the validation framework.
- * I don't think there's a need for this class to be exposed to clients. If too many
- * messages are added the framework should handle this without notifying the client
- * validator. ]
- */
-/**
- * This exception is thrown by
- *
- * @see IReporter#addMessage(IValidator, IMessage) method if no more messages can be reported
- * because the maximum number of messages has been reported.
- * @deprecated This class is not longer used by the framework. The framework is
- * not going to limit the number of messages displayed by a validator.
- */
-public class MessageLimitException extends RuntimeException {
- private final static long serialVersionUID = -7034897190745766940L;
-}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
deleted file mode 100644
index 70bdb29..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>Validation Framework (Version 1)</title>
-</head>
-<body>
-<p>An earlier framework for calling validators that are build based.</p>
-<p>This framework is being replaced by the <code>newer org.eclipse.wst.validation</code> framework.</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
deleted file mode 100644
index 83c1d55..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
+++ /dev/null
@@ -1,194 +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;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator.V2;
-
-/**
- * The class that all Validators that wish to use version two of the validation framework must subclass.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @author karasiuk
- *
- */
-public abstract class AbstractValidator {
-
- private V2 _parent;
-
- /**
- * Validate the resource. The validator is called from a WorkspaceJob, so
- * the validator itself does not need to establish it's own IWorkspaceRunnable.
- * <p>
- * If you override this method then you should not override the other validate method.
- * </p>
- *
- * @param resource
- * The resource to be validated.
- *
- * @param kind
- * The way the resource changed. It uses the same values as the kind
- * parameter in IResourceDelta.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- * At the end of the validation phase, this object will be cleared,
- * thereby allowing any of this state information to be garbaged
- * collected.
- *
- * @param monitor
- * A monitor that you can use to report your progress. To be a well
- * behaved validator you need to check the isCancelled() method at
- * appropriate times.
- *
- * @return the result of the validation. This may be, but usually isn't, null.
- */
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- return null;
- }
-
- /**
- * Validate the resource. The validator is called from a WorkspaceJob, so
- * the validator itself does not need to establish it's own
- * IWorkspaceRunnable.
- * <p>
- * If you override this method then you should not override the other
- * validate method.
- * </p>
- *
- * @param event
- * An object that describes the resource to be validated and why
- * it should be validated.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation
- * phase. At the end of the validation phase, this object will be
- * cleared, thereby allowing any of this state information to be
- * garbaged collected.
- *
- * @param monitor
- * A monitor that you can use to report your progress. To be a
- * well behaved validator you need to check the isCancelled()
- * method at appropriate times.
- *
- * @return the result of the validation. Null should never be returned. If
- * null is returned then the other validate method will be called as
- * well.
- */
- public ValidationResult validate(ValidationEvent event, ValidationState state, IProgressMonitor monitor){
- return null;
- }
-
-
- /**
- * A call back method that lets the validator know that the project is being
- * cleaned. This method gives the validator a chance to do any special
- * cleanup. The default is to do nothing.
- * <p>
- * If the entire workspace is being cleaned, then the first call will have a
- * null project, and then there will be subsequent calls for each open
- * project in the workspace.</p>
- *
- * @param project
- * The project being cleaned. This may be null, which is an indication
- * that the workspace is being cleaned.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the clean
- * takes a long time.
- */
- public void clean(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * This method is called before any validation takes place. It allows
- * validators to perform any initialization that they might need.
- *
- * @param project
- * The project that is being validated. For the very first call in the
- * validation phase, this will be null. A null project is the signal
- * that a top level validation is starting. Subsequently, the project
- * will be set, as each of the individual projects are validated.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the initialization
- * takes a long time.
- */
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * This method will be called when validation is complete. It allows
- * validators to perform any cleanup that they might need to do.
- *
- * @param project
- * The project that was validated. The very last call in the validation
- * sets this to null so that the validator knows that all the
- * projects have now been validated.
- *
- * @param state
- * A way to pass arbitrary, validator specific, data from one
- * invocation of a validator to the next, during the validation phase.
- *
- * @param monitor
- * The monitor that should be used for reporting progress if the cleanup
- * takes a long time.
- */
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){
- }
-
- /**
- * Should the validation framework first clear the markers that this
- * validator has placed on this resource? This method can be overridden by
- * validator implementors to provide a validator specific behavior.
- *
- * @param event
- * The validation event that triggered the validation.
- * @return true if the validation framework should first clear all the
- * markers that this validator produced. This is the default
- * behavior. Return false to leave the markers unchanged. It then
- * becomes the responsibility of the validator to manage it's own
- * markers for this resource, for this validation event.
- */
- public boolean shouldClearMarkers(ValidationEvent event){
- return true;
- }
-
- /**
- * Answer the validator that you belong to. The validator controls the
- * filters and various other settings.
- *
- * @nooverride
- */
- public V2 getParent(){
- return _parent;
- }
-
- void setParent(V2 parent){
- _parent = parent;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
deleted file mode 100644
index 3f1c67d..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * A resource that is dependent on another resource.
- * <p>
- * This is returned by the IDependencyIndex.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend
- * @see IDependencyIndex
- * @author karasiuk
- *
- */
-public class DependentResource {
- private IResource _resource;
- private Validator _validator;
-
- /**
- * @noreference
- */
- public DependentResource(IResource resource, Validator validator){
- _resource = resource;
- _validator = validator;
- }
-
- /**
- * Answer the resource that is depended on.
- */
- public IResource getResource() {
- return _resource;
- }
-
- /**
- * Answer the validator that asserted the dependency.
- */
- public Validator getValidator() {
- return _validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
deleted file mode 100644
index 4146636..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
+++ /dev/null
@@ -1,57 +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;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.ValType;
-
-/**
- * This class is only to be called by the validation framework and it's test cases.
- * This class is NOT part of the API.
- * <p>
- * This class provides access to some internal methods.
- * </p>
- * @author karasiuk
- *
- */
-public class Friend {
-
- public static void setMessages(Validator validator, Map<String, MessageSeveritySetting> map) {
- validator.setMessages(map);
- }
-
- /**
- * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that
- * plug-ins are not loaded too early.
- */
- public static boolean isLoaded(Validator validator){
- return validator.isLoaded();
- }
-
- public static boolean shouldValidate(Validator validator, IResource resource, boolean isManual, boolean isBuild,
- ContentTypeWrapper contentTypeWrapper){
- return validator.shouldValidate(resource, isManual, isBuild, contentTypeWrapper);
- }
-
- public static boolean shouldValidate(Validator validator, IResource resource, ValType valType,
- ContentTypeWrapper contentTypeWrapper){
-
- return validator.shouldValidate(resource, valType, contentTypeWrapper);
- }
-
- public static void setMigrated(Validator validator, boolean migrated){
- validator.setMigrated(migrated);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
deleted file mode 100644
index d9d494b..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
+++ /dev/null
@@ -1,112 +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;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-
-/**
- * This service is used to specify the resources that a particular resource depends on.
- * <p>
- * This is an optional service, validators do not need to use this Interface and can simply supply
- * their dependency information through the ValidationResult return result.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noimplement
- * @see ValidationResult
- * @author karasiuk
- *
- */
-public interface IDependencyIndex {
-
- /**
- * Assert that one resource depends on another resource as part of it's validity.
- * <p>
- * For example, if an XML file is dependent on an XSD file to be valid, the
- * resource that holds the XML file would be the dependent, and the resource
- * that holds the XSD would be the dependsOn.
- * </p>
- *
- * @param id
- * The validator id that is asserting that the dependency exists.
- * @param dependent
- * The resource that is dependent on the other resource. For example a XML file.
- * @param dependsOn
- * The resource that this being depended on. For example a XSD file.
- */
- void add(String id, IResource dependent, IResource dependsOn);
-
- /**
- * Remove all the dependency assertions for this project.
- *
- * @param project
- * The project that will have it's dependency assertions removed.
- */
- void clear(IProject project);
-
- /**
- * Answer all the resources that depend on this resource. For example, if
- * this resource was a XSD, this could answer all the XML files that
- * depended on it for their validity.
- *
- * @param resource
- * A resource that other resources may depend on.
- *
- * @return the dependent resources.
- */
- List<DependentResource> get(IResource resource);
-
- /**
- * Answer all the resources that depend on this resource. For example, if
- * this resource was a XSD, this could answer all the XML files that
- * depended on it for their validity.
- *
- * @param id
- * The validator id that asserted that the dependency exists.
- * @param resource
- * A resource that other resources may depend on.
- *
- * @return the dependent resources. This method can return null or an empty array, if
- * there are no dependent resources.
- */
- IResource[] get(String id, IResource resource);
-
- /**
- * Answer true if other resources depend on this resource.
- *
- * @param resource
- * The resource being tested.
- *
- * @return true if any of the validators asserted a dependency on this resource.
- */
- boolean isDependedOn(IResource resource);
-
- /**
- * Replace all the resources that the dependent depends on.
- *
- * @param id
- * The validator id that is asserting that the dependency exists.
- * @param dependent
- * The resource that is dependent on the other resource.
- * @param dependsOn
- * All the resources that are depended on. This can be null or a zero
- * length array. Null or a zero length array removes all the dependencies.
- */
- void set(String id, IResource dependent, IResource[] dependsOn);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java
deleted file mode 100644
index 90ebfb1..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-/**
- * A validator that has fields that can be updated.
- * <p>
- * The following procedure is used to change a Validator's settings.
- * <ol>
- * <li>An IMutableValidator is retrieved.</li>
- * <li>The IMutableValidator is changed.</li>
- * <li>The IMutableValidator is "activated".</li>
- * </ol>
- * </p>
- * <p>The methods {@link ValidationFramework#getProjectSettings(org.eclipse.core.resources.IProject)} and
- * {@link ValidationFramework#getWorkspaceSettings()} can be used to retrieve IMutableValidator's.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
-
- * @author karasiuk
- *
- */
-public interface IMutableValidator {
-
- /**
- * Answer the validator's id.
- */
- String getId();
-
- /**
- * Answer the validator's name.
- */
- String getName();
-
- /**
- * Answer the validator's class name.
- * @return
- */
- String getValidatorClassname();
-
- /**
- * Answer if the validator is enabled for build based validation.
- */
- boolean isBuildValidation();
-
- /**
- * Answer if the validator is enabled for manual based validation.
- */
- boolean isManualValidation();
-
- /**
- * Set whether the validator should be enabled for build based validation.
- */
- void setBuildValidation(boolean build);
-
- /**
- * Set whether the validator should be enabled for manual based validation.
- */
- void setManualValidation(boolean manual);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
deleted file mode 100644
index b951270..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
+++ /dev/null
@@ -1,79 +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;
-
-import java.util.List;
-
-/**
- * A service that collects performance information on validation operations.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
- * @author karasiuk
- *
- */
-public interface IPerformanceMonitor {
-
- /**
- * The level of information to collect.
- */
- public enum CollectionLevel {None, Default}
-
- /**
- * Add this performance counter to the monitor. The monitor will decide what to
- * do with the results, it may log them to a file, or it may simply hold on to them.
- *
- * @param counters
- */
- public void add(PerformanceCounters counters);
-
- /**
- * Answer true if the performance monitor is collecting performance events.
- */
- public boolean isCollecting();
-
- /** Answer true if only summary information is requested. */
- public boolean isSummaryOnly();
-
- /**
- * Set the performance event collection level. This controls which
- * performance events are collected, including none of them.
- *
- * @param level
- * The level to collect. The default is to not collect anything.
- */
- public void setCollectionLevel(CollectionLevel level);
-
- /**
- * Answer the level of performance events that are being collected by the validation framework.
- */
- public CollectionLevel getCollectionLevel();
-
- /**
- * Answer the performance counters that have been collected so far. Some
- * monitors do not save counters, and they will always return an empty list.
- *
- * @param asSummary
- * If this parameter is true, only answer a summary of the counters.
- */
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary);
-
- /**
- * Delete the collected performance counters.
- */
- public void resetPerformanceCounters();
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
deleted file mode 100644
index 5f4feee..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Validators may wish to join validator groups for performance or other
- * reasons. That way expensive operations like creating and releasing models can
- * be done in a common location, and be done only once per resource. Group listeners
- * are declared via the <code>org.eclipse.wst.validation.validatorGroup</code> extension point.
- * <p>
- * As validation proceeds, the validation framework, on a resource by resource
- * bases, determines if any validators that are members of a group are
- * interested in the resource. If they are, before the first validator in the
- * group is called, the <code>validationStarting</code> method is called. If this method was
- * called, then the <code>validationFinishing</code> method will be called once all the
- * validators have processed the resource.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public interface IValidatorGroupListener {
- /**
- * This is called before the first validator in the group that is interested
- * in the resource is called. If no validators in the group are interested
- * in the resource, then this method is not called.
- *
- * @param resource
- * The resource that is being validated.
- * @param monitor
- * A progress monitor that the method should use.
- * @param state
- * The validation state for the current operation.
- */
- void validationStarting(IResource resource, IProgressMonitor monitor, ValidationState state);
-
- /**
- * If the validationStarting method was called on the resource, then this
- * method will be called after the last validator has processed the
- * resource.
- *
- * @param resource
- * The resource that is being validated.
- * @param monitor
- * A progress monitor that the method can use.
- * @param state
- * The validation state for the current operation.
- */
- void validationFinishing(IResource resource, IProgressMonitor monitor, ValidationState state);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
deleted file mode 100644
index 4eaa3b7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
+++ /dev/null
@@ -1,140 +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;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-/**
- * Associate a message severity with a message category.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public class MessageSeveritySetting {
- public enum Severity {
- Error(ValMessages.SevError, IMarker.SEVERITY_ERROR),
- Warning(ValMessages.SevWarning, IMarker.SEVERITY_WARNING),
- Ignore(ValMessages.SevIgnore, IMarker.SEVERITY_INFO);
-
- private String _severityLabel;
- private Severity(String label, int markerSeverity){
- _severityLabel = label;
- _markerSeverity = markerSeverity;
- }
- private int _markerSeverity;
-
- @Override
- public String toString() {
- return _severityLabel;
- }
-
- /**
- * Answer the associated IMarker severity.
- */
- public int getMarkerSeverity() {
- return _markerSeverity;
- }
-
- }
-
- private String _id;
- private String _label;
- private Severity _default;
- private Severity _current;
-
- /**
- * Create an association between a label and a message severity.
- *
- * @param id
- * An id that is used to identify this particular setting. This must be
- * unique within the scope of this particular validator.
- *
- * @param label
- * An end user string, that can describe either an individual message
- * or a message category.
- *
- * @param defaultSeverity
- * The default severity for this label. If the end user doesn't change
- * anything this is what the severity will be.
- */
- public MessageSeveritySetting(String id, String label, Severity defaultSeverity){
- _id = id;
- _label = label;
- _default = defaultSeverity;
- }
-
- @Override
- public int hashCode() {
- int h = 0;
- if (_current != null)h += _current.getMarkerSeverity()*1000;
- if (_id != null)h += _id.hashCode();
- return h;
- }
-
- public String getLabel() {
- return _label;
- }
-
- /** Answer the default severity as defined by the validator owner. */
- public Severity getDefault() {
- return _default;
- }
-
- /**
- * Answer the current severity for the message. The end user may have changed this through a
- * preference dialog.
- */
- public Severity getCurrent() {
- if (_current != null)return _current;
- return _default;
- }
-
- /**
- * The id that the validator owner assigned to the message.
- */
- public String getId() {
- return _id;
- }
-
- /**
- * Set the current message severity.
- *
- * @param severity
- * @return true if the setting changed
- */
- public boolean setCurrent(Severity severity) {
- if (_current == severity)return false;
- _current = severity;
- return true;
- }
-
- @Override
- public String toString() {
- return _id + " " + getCurrent().toString(); //$NON-NLS-1$
- }
-
- /**
- * Answer a copy of this object.
- */
- public MessageSeveritySetting copy() {
- MessageSeveritySetting ms = new MessageSeveritySetting(_id, _label, _default);
- ms._current = _current;
- return ms;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java
deleted file mode 100644
index 73bf21c..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * This class holds the overall project validation settings.
- * <p>
- * The following procedure is used to change a project's Validation settings.
- * <ol>
- * <li>The MutableProjectSettings are retrieved.</li>
- * <li>The MutableProjectSettings are changed.</li>
- * <li>The MutableProjectSettings are "applied".</li>
- * </ol>
- * </p>
- * <p>In order for a project's validation setting to be effective, both
- * {@link #getOverride()} and {@link MutableWorkspaceSettings#getOverride()}
- * must be true.
- * </p>
- * <p>
- * These settings can be retrieved with {@link ValidationFramework#getProjectSettings(IProject)}.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
-
- * @author karasiuk
- *
- */
-public final class MutableProjectSettings {
- private final IProject _project;
-
- private boolean _override;
- private boolean _suspend;
- private final IMutableValidator[] _validators;
-
- public IMutableValidator[] getValidators() {
- return _validators;
- }
-
- public MutableProjectSettings(IProject project, IMutableValidator[] validators){
- _project = project;
- _validators = validators;
- }
-
- /**
- * Can this project override the workspace level validation settings?
- */
- public boolean getOverride() {
- return _override;
- }
-
- /**
- * Change whether this project can override workspace level validation settings.
- * @param override Set to true if the project is allowed to override workspace level validation settings.
- */
- public void setOverride(boolean override) {
- _override = override;
- }
-
- /**
- * Is validation suspended for this project?
- */
- public boolean getSuspend() {
- return _suspend;
- }
-
- /**
- * Change whether this project is suspending it's validation.
- * @param suspend Set to true, to suspend validation for this project.
- */
- public void setSuspend(boolean suspend) {
- _suspend = suspend;
- }
-
- /**
- * Answer the project that these settings are for.
- */
- public IProject getProject() {
- return _project;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java
deleted file mode 100644
index 80d18f1..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-
-
-/**
- * This class holds the overall workspace validation settings.
- * <p>
- * The following procedure is used to change a project's Validation settings.
- * <ol>
- * <li>The MutableWorkspaceSettings are retrieved.</li>
- * <li>The MutableWorkspaceSettings are changed.</li>
- * <li>The MutableWorkspaceSettings are "applied".</li>
- * </ol>
- * </p>
- * <p>
- * These settings can be retrieved with {@link ValidationFramework#getWorkspaceSettings()}.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
-
- * @author karasiuk
- *
- */
-public final class MutableWorkspaceSettings {
-
- private final GlobalPreferencesValues _values;
-
- private final IMutableValidator[] _validators;
-
- public IMutableValidator[] getValidators() {
- return _validators;
- }
-
- public MutableWorkspaceSettings(IMutableValidator[] validators, GlobalPreferencesValues values){
- _validators = validators;
- _values = values;
- }
-
- public GlobalPreferencesValues getGlobalPreferencesValues(){
- return _values;
- }
-
- public boolean getAutoSave() {
- return _values.saveAutomatically;
- }
-
- public void setAutoSave(boolean autoSave) {
- _values.saveAutomatically = autoSave;
- }
-
- /**
- * Can this project override the workspace level validation settings?
- */
- public boolean getOverride() {
- return _values.override;
- }
-
- /**
- * Change whether this project can override workspace level validation settings.
- * @param override Set to true if the project is allowed to override workspace level validation settings.
- */
- public void setOverride(boolean override) {
- _values.override = override;
- }
-
- /**
- * Is validation suspended for this project?
- */
- public boolean getSuspend() {
- return _values.disableAllValidation;
- }
-
- /**
- * Change whether this project is suspending it's validation.
- * @param suspend Set to true, to suspend validation for this project.
- */
- public void setSuspend(boolean suspend) {
- _values.disableAllValidation = suspend;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
deleted file mode 100644
index cf57721..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
+++ /dev/null
@@ -1,116 +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;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-/**
- * Some performance information for a validation invocation. This object is immutable.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public class PerformanceCounters {
-
- private long _when;
- private String _validatorId;
- private String _validatorName;
- private String _resourceName;
- private int _numberInvocations;
- private long _elapsedTime;
- private long _cpuTime;
-
- /**
- * @param validatorId
- * @param validatorName
- * @param resourceName
- * @param numberInvocations number of times the validator was invoked
- * @param elapsedTime elapsed time in milliseconds
- * @param cpuTime CPU time in nanoseconds
- */
- public PerformanceCounters(String validatorId, String validatorName, String resourceName,
- int numberInvocations, long elapsedTime, long cpuTime){
-
- _when = System.currentTimeMillis();
- _validatorId = validatorId;
- _validatorName = validatorName;
- _resourceName = resourceName;
- _numberInvocations = numberInvocations;
- _elapsedTime = elapsedTime;
- _cpuTime = cpuTime;
- }
-
- public String getValidatorId() {
- return _validatorId;
- }
- public int getNumberInvocations() {
- return _numberInvocations;
- }
-
- /**
- * Answer the elapsed time in milliseconds.
- */
- public long getElapsedTime() {
- return _elapsedTime;
- }
-
- /**
- * Answer the amount of CPU time in nanoseconds. If this can not be determined,
- * answer -1.
- */
- public long getCpuTime() {
- return _cpuTime;
- }
-
- @Override
- public String toString() {
- return NLS.bind(ValMessages.LogValEndTime,
- new Object[]{_validatorName, _validatorId, _resourceName, Misc.getTimeMS(_elapsedTime)});
- }
-
- public String toString(boolean asSummary){
- if (asSummary){
- if (_cpuTime != -1)return NLS.bind(ValMessages.LogValSummary2,
- new Object[]{_validatorName, _validatorId, _numberInvocations,
- Misc.getTimeMS(_elapsedTime), Misc.getTimeNano(_cpuTime)});
-
- return NLS.bind(ValMessages.LogValSummary,
- new Object[]{_validatorName, _validatorId, _numberInvocations, Misc.getTimeMS(_elapsedTime)});
- }
- return toString();
- }
-
- public String getValidatorName() {
- return _validatorName;
- }
-
- /**
- * Answer when was the event logged.
- *
- * @see System#currentTimeMillis()
- */
- public long getWhen() {
- return _when;
- }
-
- public String getResourceName() {
- return _resourceName;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
deleted file mode 100644
index 20876bf..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
+++ /dev/null
@@ -1,70 +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;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-
-/**
- * This is a temporary class to ease the transition from the previous validation framework.
- * <p>
- * This is not API.
- * @author karasiuk
- *
- */
-public class ReporterHelper implements IReporter {
- private IProgressMonitor _monitor;
- private List<IMessage> _list = new LinkedList<IMessage>();
-
- public ReporterHelper(IProgressMonitor monitor){
- _monitor = monitor;
- }
-
- public void addMessage(IValidator origin, IMessage message) {
- _list.add(message);
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {
- _monitor.subTask(message.getText(validator.getClass().getClassLoader()));
- }
-
- public List<IMessage> getMessages() {
- return _list;
- }
-
- public boolean isCancelled() {
- return _monitor.isCanceled();
- }
-
- public void removeAllMessages(IValidator origin) {
- _list.clear();
- }
-
- public void removeAllMessages(IValidator origin, Object object) {
- _list.clear();
- }
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
- _list.clear();
- }
-
- public void makeMarkers(){
- MarkerManager.getDefault().makeMarkers(_list);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java
deleted file mode 100644
index 528e58e..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java
+++ /dev/null
@@ -1,75 +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;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-
-/**
- * An object that describes which object should be validated and what triggered its validation.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @author karasiuk
- *
- */
-
-public final class ValidationEvent {
-
- private IResource _resource;
- private int _kind;
- private IResourceDelta _dependsOn;
-
- /**
- * Create an object that describes what should be validated.
- *
- * @param resource
- * The resource to be validated.
- * @param kind
- * The way the resource changed. It uses the same values as the
- * kind parameter in IResourceDelta.
- * @param dependsOn
- * If the resource is being validated because one of it's
- * dependencies has changed, that change is described here. This
- * can be null.
- */
- public ValidationEvent(IResource resource, int kind, IResourceDelta dependsOn){
- _resource = resource;
- _kind = kind;
- _dependsOn = dependsOn;
- }
-
- /**
- * The resource to be validated.
- */
- public IResource getResource() {
- return _resource;
- }
-
- /**
- * The way the resource changed. It uses the same values as the kind
- * parameter in IResourceDelta.
- */
- public int getKind() {
- return _kind;
- }
-
- /**
- * If the resource is being validated because one of it's dependencies has changed, that change is described here.
- * This method will return null when the trigger is not because of a dependency change.
- */
- public IResourceDelta getDependsOn() {
- return _dependsOn;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
deleted file mode 100644
index 17cc455..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
+++ /dev/null
@@ -1,683 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-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.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.validation.Validator.V1;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.DebugConstants;
-import org.eclipse.wst.validation.internal.DependencyIndex;
-import org.eclipse.wst.validation.internal.DisabledResourceManager;
-import org.eclipse.wst.validation.internal.DisabledValidatorManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.PerformanceMonitor;
-import org.eclipse.wst.validation.internal.ProjectUnavailableError;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValPrefManagerProject;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationRunner;
-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.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-
-/**
- * The central class of the Validation Framework.
- * <p>
- * This is a singleton class that is accessed through the getDefault() method.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationFramework {
-
- private volatile IDependencyIndex _dependencyIndex;
- private IPerformanceMonitor _performanceMonitor;
-
- private Set<IProject> _suspendedProjects;
- private boolean _suspendAllValidation;
-
- /**
- * Answer the singleton, default instance of this class.
- */
- public static ValidationFramework getDefault(){
- return Singleton.vf;
- }
-
- private ValidationFramework(){}
-
- /**
- * Add the validation builder to the project, so that the project can support
- * build time validation. It is safe to call this method, if the builder was
- * previously added to the project. It will not be added more than once.
- *
- * @param project The project that the builder is added to.
- */
- public void addValidationBuilder(IProject project){
- ValidatorManager.addProjectBuildValidationSupport(project);
- }
-
- /**
- * Clear any validation markers that may have been set by this validator.
- *
- * @param resource
- * The resource that may have it's markers cleared.
- * @param validatorId
- * The id of validator that created the marker.
- */
- public void clearMessages(IResource resource, String validatorId) throws CoreException {
- Validator v = getValidator(validatorId, null);
- if (v != null)MarkerManager.getDefault().clearMarker(resource, v);
- }
-
- /**
- * Disable all validation for the given resource. This method instructs
- * the framework to not run any validators on the given resource or any of
- * it's children. This setting is persistent. Currently this only works with version 2
- * validators.
- * <p>
- * Use the enableValidation method to restore validation.
- * </p>
- *
- * @param resource
- * The resource that is having validation disabled. It must be an IFolder or an IFile.
- *
- * @see #enableValidation(IResource)
- */
- public void disableValidation(IResource resource){
- assert resource != null;
- DisabledResourceManager.getDefault().disableValidation(resource);
- }
-
- /**
- * Enable validation for the given resource. If the resource was not
- * previously disabled this method call has no effect. Currently this only
- * works with version 2 validators.
- *
- * @param resource
- * The resource that is having validation re-enabled.
- *
- * @see #disableValidation(IResource)
- */
- public void enableValidation(IResource resource){
- DisabledResourceManager.getDefault().enableValidation(resource);
- }
-
- /**
- * Answer the dependency index. Validators can use this to determine which resources depend on which
- * other resources.
- */
- public IDependencyIndex getDependencyIndex(){
- // note how the _dependencyIndex is volatile so that this double checking approach can be used.
- if (_dependencyIndex == null){
- synchronized(this){
- if (_dependencyIndex == null)_dependencyIndex = new DependencyIndex();
- }
- }
- return _dependencyIndex;
- }
-
- /**
- * Answer a performance monitor for the validators.
- */
- public synchronized IPerformanceMonitor getPerformanceMonitor(){
- if (_performanceMonitor == null){
- boolean traceTimes = Misc.debugOptionAsBoolean(DebugConstants.TraceTimes);
- String traceFile = Platform.getDebugOption(DebugConstants.TraceTimesFile);
- boolean useDoubles = Misc.debugOptionAsBoolean(DebugConstants.TraceTimesUseDoubles);
-
- _performanceMonitor = PerformanceMonitor.create(traceTimes, traceFile, useDoubles);
- }
- return _performanceMonitor;
- }
-
- /**
- * Answer the preference store that holds the persisted global validation settings.
- */
- public IEclipsePreferences getPreferenceStore(){
- return new InstanceScope().getNode(ValidationPlugin.PLUGIN_ID);
- }
-
- public IReporter getReporter(IProject project, IProgressMonitor monitor){
- return new WorkbenchReporter(project, monitor);
- }
-
- /**
- * Answer all the validators that are applicable for the given resource. A validator is
- * still returned even if it has been turned off by the user.
- * <p>
- * The caller may still need to test if the validator has been turned off by
- * the user, by using the isBuildValidation() and isManualValidation()
- * methods.
- * </p>
- *
- * @param resource
- * The resource that determines which validators are applicable.
- *
- * @param isManual
- * If true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter
- * out validators.
- *
- * @param isBuild
- * If true then the validator must be turned on for build based
- * validation. If false then the isBuildValidation setting isn't used
- * to filter out validators.
- *
- * @see Validator#isBuildValidation()
- * @see Validator#isManualValidation()
- */
- public Validator[] getValidatorsFor(IResource resource, boolean isManual, boolean isBuild){
- IProject project = resource.getProject();
- List<Validator> list = new LinkedList<Validator>();
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : ValManager.getDefault().getValidators(project)){
- if (val.shouldValidate(resource, isManual, isBuild, ctw))list.add(val);
- }
-
- Validator[] result = new Validator[list.size()];
- list.toArray(result);
- return result;
- }
-
- /**
- * Answer all the validators that should not validate the resource, either
- * because their filters don't support the resource, or the validator has
- * been disabled for both build validation and manual validation.
- *
- * @param resource
- * The resource this is being tested.
- */
- public Set<Validator> getDisabledValidatorsFor(IResource resource){
- return DisabledValidatorManager.getDefault().getDisabledValidatorsFor(resource);
- }
-
- /**
- * Answer the global validator with the given id.
- *
- * @deprecated Use getValidator(String id, IProject project) with a null project instead.
- *
- * @param id
- * @return null if the validator is not found
- */
- public Validator getValidator(String id){
- return ValManager.getDefault().getValidatorWithId(id, null);
- }
-
- /**
- * Answer the validator with the given id that is in effect for the given
- * project.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If this is allowed and if the project has it's own settings,
- * then those validators are returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param id
- * Validator id.
- * @param project
- * This can be null, in which case all the registered validators are
- * checked.
- * @return null if the validator is not found
- */
- public Validator getValidator(String id, IProject project){
- return ValManager.getDefault().getValidatorWithId(id, project);
- }
-
- /**
- * Answer copies of all the registered validators.
- *
- * @return Answer an empty array if there are no validators.
- */
- public Validator[] getValidators(){
- return ValManager.getDefault().getValidatorsCopy();
- }
-
- /**
- * Answer the validation settings that have been defined on the
- * project. To "activate" any changes to these settings, the
- * {@link #applyChanges(MutableProjectSettings, boolean)} method needs to be
- * called.
- *
- * @param project The project who's settings you wish to examine or change.
- * @return Validation settings that apply to the given project.
- */
- public MutableProjectSettings getProjectSettings(IProject project){
- ProjectPreferences pp = ValManager.getDefault().getProjectPreferences(project);
- Validator[] vals = pp.getValidators();
- ValidatorMutable[] vms = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
-
- MutableProjectSettings mps = new MutableProjectSettings(project, vms);
- mps.setOverride(pp.getOverride());
- mps.setSuspend(pp.getSuspend());
- return mps;
- }
-
- /**
- * Answer the validation settings that have been defined at the workspace level.
- * To "activate" any changes to these settings, the
- * {@link #applyChanges(MutableWorkspaceSettings, boolean)} method needs to be
- * called.
- *
- * @return Validation settings that apply to the entire workspace.
- */
- public MutableWorkspaceSettings getWorkspaceSettings() throws InvocationTargetException{
-
- ValManager vm = ValManager.getDefault();
- GlobalPreferences gp = vm.getGlobalPreferences();
-
- Validator[] vals = vm.getValidators();
- ValidatorMutable[] vms = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
-
- MutableWorkspaceSettings mws = new MutableWorkspaceSettings(vms, gp.asValues());
- return mws;
- }
-
- /**
- * Apply the changes that have been been to the validation settings.
- *
- * @param settings
- * The project settings.
- * @param persist
- * If true then the changes are persisted to the property files.
- * If false the changes are applied to the validators, but are
- * not persisted.
- */
- public void applyChanges(MutableProjectSettings settings, boolean persist){
- ValPrefManagerProject vpm = new ValPrefManagerProject(settings.getProject());
- vpm.savePreferences(settings, persist);
- }
-
- /**
- * Apply the changes that have been been to the validation settings.
- *
- * @param settings
- * The workspace settings.
- * @param persist
- * If true then the changes are persisted to the property files.
- * If false the changes are applied to the validators, but are
- * not persisted.
- */
- public void applyChanges(MutableWorkspaceSettings settings, boolean persist){
-
- ValManager vm = ValManager.getDefault();
- GlobalPreferencesValues gpv = settings.getGlobalPreferencesValues();
- vm.replace(gpv);
-
- IMutableValidator[] mvs = settings.getValidators();
- ValidatorMutable[] vals = new ValidatorMutable[mvs.length];
- for (int i=0; i<mvs.length; i++)vals[i] = (ValidatorMutable)mvs[i];
- ValPrefManagerGlobal.getDefault().savePreferences(vm.getGlobalPreferences(), vals, persist);
- ValPrefManagerGlobal.saveV1Preferences(vals, persist);
- }
-
- /**
- * Validators can use project level settings (Project natures and facets) to
- * determine if they are applicable to the project or not.
- *
- * @param project
- * The project that the configuration is based on.
- * @return The copies of the validators that are configured to run on this project based
- * on the project level settings.
- * @throws ProjectUnavailableError
- */
- public Validator[] getValidatorsConfiguredForProject(IProject project) throws ProjectUnavailableError {
- Validator[] orig = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.Normal);
- Validator[] copy = new Validator[orig.length];
- for (int i=0; i<orig.length; i++)copy[i] = orig[i].copy();
- return copy;
- }
-
- /**
- * Answer all the validators that are applicable for the given resource.
- *
- * @param resource the resource that determines which validators are applicable.
- */
- public Validator[] getValidatorsFor(IResource resource){
- List<Validator> list = new LinkedList<Validator>();
- for (Validator v : getValidatorsFor(resource, false, false)){
- if (v.isBuildValidation() || v.isManualValidation())list.add(v);
- }
- Validator[] vals = new Validator[list.size()];
- return list.toArray(vals);
- }
-
- /**
- * Answer true if the resource has any enabled validators.
- *
- * @param resource
- * A file, folder or project.
- *
- * @param isManual
- * If true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter
- * out validators.
- *
- * @param isBuild
- * If true then the validator must be turned on for build based
- * validation. If false then the isBuildValidation setting isn't used
- * to filter out validators.
- */
- public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
- return ValManager.getDefault().hasValidators(resource, isManual, isBuild);
- }
-
- /**
- * Answer whether or not the validator has been activated, i.e. has the
- * bundle that defines the validator been loaded. We do not want to cause
- * unnecessary bundle loading, so this check can be performed by third party
- * callers, to prevent making other calls that will force the validator to
- * be loaded.
- *
- * @param validator
- * The validator that is being tested.
- * @return true if the validator has already been loaded.
- */
- public boolean isLoaded(Validator validator){
- return validator.isLoaded();
- }
-
- /**
- * Waits until all validation jobs are finished. This method will block the
- * calling thread until all such jobs have finished executing, or until this
- * thread is interrupted. If there are no validation jobs that are
- * currently waiting, running, or sleeping, this method returns immediately.
- * Feedback on how the join is progressing is provided to the progress
- * monitor.
- * <p>
- * If this method is called while the job manager is suspended, only jobs
- * that are currently running will be joined. Once there are no jobs in the
- * family in the {@link Job#RUNNING} state, this method returns.
- * </p>
- * <p>
- * Note that there is a deadlock risk when using join. If the calling thread
- * owns a lock or object monitor that the joined thread is waiting for,
- * deadlock will occur. This method can also result in starvation of the
- * current thread if another thread continues to add jobs of the given
- * family, or if a job in the given family reschedules itself in an infinite
- * loop.
- * </p>
- *
- * @param monitor
- * Progress monitor for reporting progress on how the wait is
- * progressing, or <code>null</code> if no progress monitoring is
- * required.
- * @exception InterruptedException
- * if this thread is interrupted while waiting
- * @exception OperationCanceledException
- * if the progress monitor is canceled while waiting
- */
- public void join(IProgressMonitor monitor) throws InterruptedException, OperationCanceledException {
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor);
- Job.getJobManager().join(ValidationBuilder.FAMILY_VALIDATION_JOB, monitor);
- }
-
- /**
- * Suspends, or undoes the suspension of, validation on the current project.
- * If <b>suspend</b> is true then validation is suspended and if it's false
- * then validation is not suspended on the project. The value of this
- * variable is not persisted.
- * <p>
- * Be <b>very careful</b> when you use this method! Turn validation back on in a
- * finally block because if the code which suspended validation crashes, the
- * user has no way to reset the suspension. The user will have to shut down
- * and restart the workbench to get validation to work again.
- * </p>
- *
- * @param project
- * The project that is to be suspended or unsuspended.
- * @param suspend
- * If true, validation on the project will be suspend. If false it will
- * not be suspended.
- */
- public void suspendValidation(IProject project, boolean suspend) {
- if (project == null)return;
- if (suspend)getSuspendedProjects().add(project);
- else getSuspendedProjects().remove(project);
- }
-
- private synchronized Set<IProject> getSuspendedProjects(){
- if (_suspendedProjects == null)_suspendedProjects = Collections.synchronizedSet(new HashSet<IProject>(20));
- return _suspendedProjects;
- }
-
- /**
- * Save the validators settings into the persistent store, there by making their settings the active settings.
- * <p>
- * A common use of this method would be to change whether particular validators are enabled or not. For example
- * if you only wanted the JSP validator enabled, you could use code similar to this:
- * <pre>
- * ValidationFramework vf = ValidationFramework.getDefault();
- * Validator[] vals = vf.getValidators();
- * for (Validator v : vals){
- * boolean enabled = false;
- * if (v.getValidatorClassname().equals("org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator"))enabled = true;
- * v.setBuildValidation(enabled);
- * v.setManualValidation(enabled);
- * }
- * vf.saveValidators(vals);
- * </pre>
- * </p>
- *
- * @param validators The validators that you are saving.
- *
- * @throws InvocationTargetException
- */
- public void saveValidators(Validator[] validators) throws InvocationTargetException{
-
-
- ValPrefManagerGlobal gp = ValPrefManagerGlobal.getDefault();
- gp.saveAsPrefs(validators);
-
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
-
- List<ValidatorMetaData> manual = new LinkedList<ValidatorMetaData>();
- List<ValidatorMetaData> build = new LinkedList<ValidatorMetaData>();
- for (Validator v : validators){
- V1 v1 = v.asV1Validator();
- if (v1 == null)continue;
- if (v1.isManualValidation())manual.add(v1.getVmd());
- if (v1.isBuildValidation())build.add(v1.getVmd());
- }
-
- ValidatorMetaData[] array = new ValidatorMetaData[manual.size()];
- gc.setEnabledManualValidators(manual.toArray(array));
-
- array = new ValidatorMetaData[build.size()];
- gc.setEnabledBuildValidators(build.toArray(array));
-
- gc.passivate();
- gc.store();
- }
-
- /**
- * Suspends, or undoes the suspension of, validation on all projects in the
- * workbench. If "suspend" is true then validation is suspended and if it's
- * "false" then validation is not suspended. The value of this variable is
- * not persisted.
- * <p>
- * Be <b>very careful</b> when you use this method! Turn validation back on in a
- * finally block because if the code which suspended validation crashes, the
- * user has no way to reset the suspension. The user will have to shut down
- * and restart the workbench to get validation to work again.
- * </p>
- */
- public void suspendAllValidation(boolean suspend) {
- _suspendAllValidation = suspend;
- }
-
- /**
- * Return true if "suspend all" is enabled, false otherwise.
- */
- public boolean isSuspended() {
- return _suspendAllValidation;
- }
-
- /**
- * Returns true if validation will not run on the project because it's been suspended. This
- * method checks only the suspension status; if validation cannot run for some other reason (for
- * example, there are no enabled validators), yet the IProject is not suspended, this method
- * will return true even though validation will not run.
- */
- public boolean isSuspended(IProject project) {
- if (_suspendAllValidation)return true;
- if (project == null)return false;
- return getSuspendedProjects().contains(project);
- }
-
- /**
- * This method should be called by any code that is preparing to suspend validation on a
- * project. Rather than calling isSuspended(IProject), which will also return true if all validation
- * has been suspended.
- *
- * @param project the project that is being tested
- * @return boolean true if the project has been suspended
- */
- public boolean isProjectSuspended(IProject project) {
- if (project == null)return false;
- return getSuspendedProjects().contains(project);
- }
-
- /**
- * Validate the projects. Exactly one of isManual or isBuild needs to be true.
- *
- * @param projects
- * The projects to be validated.
- *
- * @param isManual
- * Is this being done as part of a manual validation? i.e. did
- * the user select the Validate menu item?
- *
- * @param isBuild
- * Is this being done as part of a build?
- *
- * @param monitor
- *
- * @return the validation result which is the combined result for all the
- * resources that were validated.
- */
- public ValidationResults validate(IProject[] projects, final boolean isManual, final boolean isBuild,
- IProgressMonitor monitor) throws CoreException{
- ValType type = ValType.Build;
- if (isManual)type = ValType.Manual;
- ValOperation vo = ValidationRunner.validate(createMap(projects), type, monitor, true);
- return vo.getResults();
- }
-
- /**
- * Validate a specific file resource.
- *
- * @param file
- * The file to be validated.
- * @param monitor
- * Progress monitor.
- * @return the result of validating the file.
- */
- public ValidationResults validate(IFile file, IProgressMonitor monitor) throws CoreException{
- ValOperation vo = ValidationRunner.validate(file, ValType.Manual, monitor, true);
- return vo.getResults();
- }
-
- /**
- * Answer all the resources in the projects as a map.
- * @param projects
- */
- private Map<IProject, Set<IResource>> createMap(IProject[] projects) throws CoreException{
- final HashMap<IProject, Set<IResource>> map = new HashMap<IProject, Set<IResource>>(1000);
-
- for (IProject p : projects){
- Set<IResource> set = new HashSet<IResource>(1000);
- ResourceAdder ra = new ResourceAdder(set);
- p.accept(ra);
- map.put(p, set);
- }
- return map;
- }
-
- public static class ResourceAdder implements IResourceVisitor {
-
- private Set<IResource> _set;
-
- /**
- * A class that knows how to add resources to a set.
- * @param set the set where the resources are added.
- */
- public ResourceAdder(Set<IResource> set){
- _set = set;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- // [225839] the older validators only expect files and folders.
- int type = resource.getType();
- if (type == IResource.FILE || type == IResource.FOLDER)_set.add(resource);
- return true;
- }
-
- }
-
- /**
- * Store the singleton for the ValidationFramework. This approach is used to avoid having to synchronize the
- * ValidationFramework.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private static class Singleton {
- static ValidationFramework vf = new ValidationFramework();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
deleted file mode 100644
index c1714e1..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * The result of running a validate operation. Validators create and return this objects as part of
- * performing their validation.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationResult {
-
- private final List<ValidatorMessage> _messages = new LinkedList<ValidatorMessage>();
-
- private final static ValidatorMessage[] _noMessages = new ValidatorMessage[0];
-
- private boolean _canceled;
-
- /**
- * The resources that the validated resource depends on. This can be left null.
- * For example, an XML file may depend on a XSD in order to know if it is valid or not.
- * It would pass back the XSD file.
- */
- private IResource[] _dependsOn;
-
- /**
- * The objects that you validated as a side effect of validating this object. The framework will not
- * call you with any of these objects (in this validation run). This can be left null.
- */
- private IResource[] _validated;
-
- private int _severityError;
- private int _severityWarning;
- private int _severityInfo;
-
- private IProject _suspendValidation;
-
- /** A count of the number of resources that were validated. */
- private int _numberOfValidatedResources = 1;
-
- private ReporterHelper _reporter;
- private ValidationException _validationException;
-
- /**
- * This is an optional method, that a validator can use to return error
- * messages. The validation framework converts these into IMarkers.
- * <p>
- * The scenario that motivated this method, is when a validator is used both
- * for <b>as you type</b> validation and <b>build</b> validation. When
- * called in as you type mode, the validator doesn't want to directly create IMarkers,
- * because the resource hasn't been saved yet. It needs to return something
- * other than an IMarker. But when called in build mode, it does ultimately
- * want IMarkers. By returning ValidatorMessages, it only needs to return
- * one type of message, and those messages can be either be directly used by
- * the caller, or automatically converted into IMarkers by the validation
- * framework.
- * </p>
- * <p>
- * To make matters even more complicated there is a third way to return
- * messages. To make it easier for old validators to port to the new
- * framework, they can continue to use an IReporter. If a validator calls
- * the getReporter() method then it is assumed by the framework that that is
- * the approach that they have chosen.
- * </p>
- *
- * @see #getReporter(IProgressMonitor)
- *
- * @param message
- * A validation message.
- */
- public void add(ValidatorMessage message){
- _messages.add(message);
- }
-
- /**
- * Answer an IReporter for handing error messages.
- * <p>
- * This is a transition method, to help old validators port to the new validation framework. If this method
- * is called it is assumed by the framework, that this IReporter will be used as the only way of passing messages
- * back to the framework.
- *
- * @see #add(ValidatorMessage)
- * @param monitor
- */
- public IReporter getReporter(IProgressMonitor monitor){
- if (_reporter == null)_reporter = new ReporterHelper(monitor);
- return _reporter;
- }
-
- ReporterHelper getReporterHelper(){
- return _reporter;
- }
-
- /**
- * Merge the message counts and messages from an individual validator into this result.
- * @param result it can be null, in which case it is ignored.
- */
- public void mergeResults(ValidationResult result){
- if (result == null)return;
-
- ValidatorMessage[] msgs = result.getMessages();
- for (ValidatorMessage m : msgs){
- add(m);
- int severity = m.getAttribute(IMarker.SEVERITY, 0);
- switch (severity){
- case IMarker.SEVERITY_ERROR:
- incrementError(1);
- break;
- case IMarker.SEVERITY_WARNING:
- incrementWarning(1);
- break;
- case IMarker.SEVERITY_INFO:
- incrementInfo(1);
- break;
-
- }
- }
-
- incrementError(result.getSeverityError());
- incrementWarning(result.getSeverityWarning());
- incrementInfo(result.getSeverityInfo());
-
- _numberOfValidatedResources += result.getNumberOfValidatedResources();
-
- }
-
- /**
- * Answer the resources that the validated resource depends on.
- */
- public IResource[] getDependsOn() {
- return _dependsOn;
- }
-
- /**
- * Answer any validation messages that were added by the validator.
- * @return an array is returned even if there are no messages.
- */
- public ValidatorMessage[] getMessages(){
- if (_messages == null)return _noMessages;
- ValidatorMessage[] msgs = new ValidatorMessage[_messages.size()];
- _messages.toArray(msgs);
- return msgs;
- }
-
- /**
- * Answer a copy of any validation messages that were added by the validator. The array is a new
- * array, and each message is a copy.
- * @return an array is returned even if there are no messages.
- */
- public synchronized ValidatorMessage[] getMessagesAsCopy(){
- if (_messages == null)return _noMessages;
- ValidatorMessage[] msgs = new ValidatorMessage[_messages.size()];
- int i = 0;
- for (ValidatorMessage msg : _messages)msgs[i++] = msg.asCopy();
- return msgs;
- }
-
- /**
- * Update the resources that the validated resource depends on. This can be
- * left null. For example, a XML file may depend on a XSD file in order to
- * know if it is valid or not. It would pass back that XSD file.
- *
- * @param dependsOn
- * If this is null then the dependency information is not updated. To
- * remove the dependency information, an empty array needs to be
- * supplied. A non null parameter, <b>replaces</b> all the dependency
- * information for this resource, for this validator.
- */
- public void setDependsOn(IResource[] dependsOn) {
- _dependsOn = dependsOn;
- }
-
- /**
- * @return All the resources that were validated as a side-effect of
- * validating the main resource, or null if none were.
- */
- public IResource[] getValidated() {
- return _validated;
- }
-
- /**
- * Indicate that additional resources have been validated as part of this
- * validate operation. Sometimes in the course of performing a validation on
- * one resource it is necessary to validate other resources as well. This
- * method is used to let the framework know about these additional validated
- * resources, to possibly save them being validated redundantly.
- *
- * @param validated
- * Any additional resources that were validated.
- */
- public void setValidated(IResource[] validated) {
- _validated = validated;
- }
-
- /**
- * Answer the number of error messages that were generated as part of this validation operation.
- */
- public int getSeverityError() {
- return _severityError;
- }
-
- /**
- * Set the number of error messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityError(int severityError) {
- _severityError = severityError;
- }
-
-
- /**
- * Increment the number of error messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of errors.
- */
- public int incrementError(int errors){
- _severityError += errors;
- return _severityError;
- }
-
- /**
- * Answer the number of warning messages that were generated as part of this validation operation.
- */
- public int getSeverityWarning() {
- return _severityWarning;
- }
-
- /**
- * Set the number of warning messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityWarning(int severityWarning) {
- _severityWarning = severityWarning;
- }
-
- /**
- * Increment the number of warning messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of warnings.
- */
- public int incrementWarning(int warnings){
- _severityWarning += warnings;
- return _severityWarning;
- }
-
- /**
- * Answer the number of informational messages that were generated as part of this validation operation.
- */
- public int getSeverityInfo() {
- return _severityInfo;
- }
-
- /**
- * Set the number of informational messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- */
- public void setSeverityInfo(int severityInfo) {
- _severityInfo = severityInfo;
- }
-
- /**
- * Increment the number of informational messages that were generated as part of this validation operation.
- * <p>
- * Messages added through the add(ValidationMessage) method should not be included here, as this
- * information will be determined from the ValidationMessage.
- * </p>
- *
- * @return the current number of informational message.
- */
- public int incrementInfo(int info){
- _severityInfo += info;
- return _severityInfo;
- }
-
- /**
- * Was the operation canceled before it completed? For example if the validation is being run through the
- * user interface, the end user can cancel the operation through the progress monitor.
- *
- * @return true if the operation was canceled
- */
- public boolean isCanceled() {
- return _canceled;
- }
-
- /**
- * Indicate if the operation was canceled.
- *
- * @param canceled
- * Set to true if it was canceled and false if it was not canceled.
- */
- public void setCanceled(boolean canceled) {
- _canceled = canceled;
- }
-
- /**
- * Answer the number of resources that have been validated.
- */
- public int getNumberOfValidatedResources() {
- if (_validated == null)return _numberOfValidatedResources;
- return _numberOfValidatedResources + _validated.length;
- }
-
- /**
- * If the validation ended with an exception, answer it.
- * @return null if the validator did not finish with an exception.
- */
- public ValidationException getValidationException() {
- return _validationException;
- }
-
- /**
- * If the validation failed with an exception, it can be recorded here.
- * <p>
- * This method is provided for old validators to ease their transition to the new framework.
- * </p>
- * @param validationException
- */
- public void setValidationException(ValidationException validationException) {
- _validationException = validationException;
- }
-
- /**
- * Answer the project that the validator would like to have suspended.
- *
- * @return the project to suspend or null. The normal result is null, which means that
- * the validator wishes to receive normal validation requests.
- */
- public IProject getSuspendValidation(){
- return _suspendValidation;
- }
-
- /**
- * Calling this method will inform the framework, that this validator does not wish to be
- * called again for any resources in this project, for the duration of this validation operation.
- * <p>
- * Some validators may have a rich set of triggers, but once they have been invoked once,
- * do not need to be invoked again during the course of the current validation.
- * </p>
- * @param project The project that this validator no longer wants to be notified on.
- */
- public void setSuspendValidation(IProject project) {
- _suspendValidation = project;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
deleted file mode 100644
index ba947f8..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation;
-
-
-/**
- * The combined results of validating multiple resources.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationResults {
-
- private final ValidatorMessage[] _messages;
- private final int _error;
- private final int _warn;
- private final int _info;
-
- public ValidationResults(ValidationResult result){
- if (result == null){
- _messages = new ValidatorMessage[0];
- _error = 0;
- _warn = 0;
- _info = 0;
- }
- else {
- _messages = result.getMessagesAsCopy();
- _error = result.getSeverityError();
- _warn = result.getSeverityWarning();
- _info = result.getSeverityInfo();
- }
- }
-
- /**
- * Answer any validation messages that were added by the validation operation.
- * @return an array is returned even if there are no messages.
- */
- public ValidatorMessage[] getMessages(){
- return _messages;
- }
-
- /**
- * Answer the number of error messages that were generated as part of this validation operation.
- */
- public int getSeverityError() {
- return _error;
- }
-
- /**
- * Answer the number of informational messages that were generated as part of this validation operation.
- */
- public int getSeverityInfo() {
- return _info;
- }
-
- /**
- * Answer the number of warning messages that were generated as part of this validation operation.
- */
- public int getSeverityWarning() {
- return _warn;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
deleted file mode 100644
index 8097de4..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
+++ /dev/null
@@ -1,90 +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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Keep track of arbitrary validation data, during the course of a validation.
- * <p>
- * To enable more efficient caching, the validation framework, allows individual validators to cache
- * arbitrary data during the validation process. Use of this object is completely optional.
- * <p>
- * Since some validators wish to share data with other validators, any validator can see the state data for
- * any other validator, since the id is simply the validator's extension id.
- * <p>
- * This object is freed at the end of the validation process.
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- * @noextend
- * @author karasiuk
- *
- */
-public final class ValidationState {
-
- /**
- * This is a special id.
- * <p>
- * If a resource that is depended on by others is changed, then the
- * dependent resources are validated. The depended on resource, which is the
- * resource that actually changed, is placed into the ValidationState using
- * this id.
- * </p>
- * @deprecated This approach is not thread safe, the longer form of the AbstractValidator validate method should be used instead.
- * @see AbstractValidator#validate(ValidationEvent, ValidationState, org.eclipse.core.runtime.IProgressMonitor)
- */
- public static final String TriggerResource = ValidationPlugin.PLUGIN_ID + ".Trigger"; //$NON-NLS-1$
-
- // I can't use a ConncurrentHashMap because some of the clients store nulls.
- private final Map<String, Object> _map = new HashMap<String, Object>(50);
-
- public ValidationState(){
- }
-
- /**
- * Save some state information.
- *
- * @param id
- * By convention this is the fully qualified validator extension id.
- * For example: org.eclipse.wst.html.ui.HTMLValidator
- *
- * @param value
- * Any arbitrary data that the validator might find useful. The
- * validation framework doesn't do anything with this object except
- * pass it along during the validation process.
- */
- public synchronized void put(String id, Object value){
- _map.put(id, value);
- }
-
- /**
- * Answer the state data for the given validator.
- *
- * @param id
- * By convention this is the fully qualified validator extension point
- * id. For example org.eclipse.wst.html.ui.HTMLValidator
- *
- * @return any arbitrary data that the validator might find useful,
- * including null.
- */
- public synchronized Object get(String id){
- return _map.get(id);
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
deleted file mode 100644
index 2adb3bb..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
+++ /dev/null
@@ -1,1353 +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;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.MarkerManager;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.NullValidator;
-import org.eclipse.wst.validation.internal.SummaryReporter;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValPrefManagerProject;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorExtensionReader;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
-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.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * Represents a validator. This gets instantiated through one of the validator extension points.
- * <p>
- * <b>This class is not API</b>.
- * </p>
- *
- * @author karasiuk
- *
- */
-public abstract class Validator implements Comparable<Validator> {
- // Remember if you add a new instance variable, make sure that you update the copy and become methods
-
- /**
- * The level of configuration for the validator.
- * <ul>
- * <li>Extension - Defined by an extension point.</li>
- * <li>Global - Defined by a global preference.</li>
- * <li>Project - Defined by a project property.</li>
- * </ul>
- */
- public enum Level {Extension, Global, Project};
-
- protected boolean _buildValidation = true;
-
- /** If this is a delegating validator, then this field holds the validator that will be delegated to. */
- private String _delegatingId;
-
- /**
- * If this validator is also used to control an ISource validator, the id of the ISource validator is
- * registered here.
- */
- private String _sourceId;
-
- protected boolean _manualValidation = true;
-
- /** An optional customized marker id for this validator. */
- private String _markerId;
-
- /**
- * Version of the filter definition. By increasing this number the framework can know that a plug-in has
- * changed it's filters.
- */
- private int _version = 1;
-
- /** Map simple message id's to message settings. */
- private Map<String, MessageSeveritySetting> _messageSettings;
-
- /** The project that you are defined in. This can be null which means that you are a global validator. */
- protected IProject _project;
-
- /** How many times has a global field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountGlobal;
-
- /** How many times has a message field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountMessages;
-
- /** Has the validator been migrated from an earlier version in this session, but not yet saved? */
- private boolean _migrated;
-
- public Validator(IProject project){
- _project = project;
- }
-
- void setMigrated(boolean migrated){
- _migrated = migrated;
- }
-
- /**
- * Create a new validator based on a abstract validator.
- *
- * @param validator
- * The validator that is being wrapped.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- */
- public static Validator create(IConfigurationElement validator, IProject project) {
- V2 v2 = new V2(validator, project);
- return v2;
- }
-
- /**
- * Create a new validator based on validator meta data.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- */
- public static Validator create(ValidatorMetaData vmd, ValidationConfiguration config, IProject project){
- V1 v1 = new V1(vmd, config, project);
- return v1;
- }
-
- /**
- * If you are a version 1 validator, answer yourself as one, otherwise answer null.
- */
- public V1 asV1Validator(){
- return null;
- }
-
- /**
- * If you are a version 2 validator, answer yourself as one, otherwise answer null.
- */
- public V2 asV2Validator() {
- return null;
- }
-
- /**
- * The project is being cleaned, this method gives the validator a chance to do any special cleanup.
- * The default is to do nothing.
- *
- * @param project the project being built.
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void clean(IProject project, ValOperation operation, IProgressMonitor monitor){
- }
-
- /**
- * Compare yourself based on Validator name.
- */
- public int compareTo(Validator validator) {
- return getName().compareTo(validator.getName());
- }
-
- /** Answer a deep copy of yourself. */
- public Validator copy(){
- return copy(false);
- }
-
- public abstract Validator copy(boolean includeChangeCounts);
-
- /**
- * Update your direct, non transient fields from the fields in v.
- */
- protected void copyLocal(Validator v, boolean includeChangeCounts){
- _buildValidation = v._buildValidation;
- _delegatingId = v._delegatingId;
- _manualValidation = v._manualValidation;
- _markerId = v._markerId;
- _messageSettings = v._messageSettings;
- _sourceId = v._sourceId;
- _version = v._version;
- _migrated = v._migrated;
-
- if (includeChangeCounts){
- _changeCountGlobal = v._changeCountGlobal;
- _changeCountMessages = v._changeCountMessages;
- }
- }
-
- /**
- * Should the validation framework first clear the markers that this
- * validator has placed on this resource? This method can be overridden by
- * validator implementors to provide a validator specific behavior.
- *
- * @param event
- * The validation event that triggered the validation.
- * @return true if the validation framework should first clear all the
- * markers that this validator produced. This is the default
- * behavior. Return false to leave the markers unchanged. It then
- * becomes the responsibility of the validator to manage it's own
- * markers for this resource, for this validation event.
- */
- public boolean shouldClearMarkers(ValidationEvent event){
- return true;
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param isManual
- * If true then this validator must also be enabled for manual
- * validation.
- * @param isBuild
- * If true then this validator must also be enabled for builder
- * based validation.
- *
- * @return true if the resource should be validated.
- */
- public boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild){
- return shouldValidate(resource, isManual, isBuild, new ContentTypeWrapper());
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param isManual
- * If true then this validator must also be enabled for manual
- * validation.
- * @param isBuild
- * If true then this validator must also be enabled for builder
- * based validation.
- * @param contentTypeWrapper
- * For repeated calls on the same resource, it is more efficient
- * to remember the content type.
- * @return true if the resource should be validated.
- * @see Friend#shouldValidate(Validator, IResource, boolean, boolean, ContentTypeWrapper)
- */
- boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild,
- ContentTypeWrapper contentTypeWrapper){
-
- if (isManual && !_manualValidation)return false;
- if (isBuild && !_buildValidation)return false;
-
- return shouldValidate(resource, contentTypeWrapper);
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param valType
- * The context to use when performing the check.
- *
- * @return true if the resource should be validated.
- */
- public boolean shouldValidate(IResource resource, ValType valType){
- return shouldValidate(resource, valType, new ContentTypeWrapper());
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate
- * this resource. This method does not check to see if global validation or
- * project validation has been suspended or not.
- *
- * @param resource
- * The resource to be checked.
- * @param valType
- * The context to use when performing the check.
- * @param contentTypeWrapper
- * For repeated calls on the same resource, it is more efficient
- * to remember the content type.
- *
- * @return true if the resource should be validated.
- *
- * @see Friend#shouldValidate(Validator, IResource, ValType, ContentTypeWrapper)
- */
- boolean shouldValidate(IResource resource, ValType valType, ContentTypeWrapper contentTypeWrapper){
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-01: checking if " + getId() + " should validate " + resource); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (valType == ValType.Manual && !_manualValidation)return false;
- if (valType == ValType.Build && !_buildValidation)return false;
-
- boolean result = shouldValidate(resource, contentTypeWrapper);
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-02: result = " + result); //$NON-NLS-1$
- }
-
- return result;
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this project. This method
- * does not check to see if global validation or project validation has been suspended or not.
- *
- * @param project the project to be checked
- * @param type The type of validation request
- *
- * @return true if the project should be validated.
- */
- public boolean shouldValidateProject(IProject project, ValType type){
- return shouldValidateProject(project, type == ValType.Manual, type == ValType.Build);
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this project. This method
- * does not check to see if global validation or project validation has been suspended or not.
- *
- * @param project the project to be checked
- * @param isManual if true then this validator must also be enabled for manual validation.
- * @param isBuild if true then this validator must also be enabled for builder based validation.
- *
- * @return true if the project should be validated.
- */
- public boolean shouldValidateProject(IProject project, boolean isManual, boolean isBuild){
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-03: checking if " + getId() + " should validate " + project); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (isManual && !_manualValidation)return false;
- if (isBuild && !_buildValidation)return false;
- if (project == null || !project.isOpen())return false;
- boolean result = shouldValidateProject(project);
- if (Tracing.matchesExtraDetail(getId())){
- Tracing.log("Validator-04: result " + result); //$NON-NLS-1$
- }
- return result;
- }
-
- /**
- * Validate the resource.
- *
- * @param resource
- * The resource to be validated.
- * @param kind
- * The kind of resource change, see IResourceDelta for values.
- * @param operation
- * The operation that this validation is running under. This can
- * be null.
- * @param monitor
- * A way to report progress. This can be null.
- *
- * @return the result of doing the validation, it can be, but usually isn't
- * null.
- */
- public abstract ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor);
-
- /**
- * Validate the resource.
- *
- * @param resource
- * The resource to be validated.
- * @param kind
- * The kind of resource change, see IResourceDelta for values.
- * @param operation
- * The operation that this validation is running under. This can
- * be null.
- * @param monitor
- * A way to report progress. This can be null.
- * @param event
- * An event that describes in more detail what should be
- * validated and why it should be validated. This can be null.
- *
- * @return the result of doing the validation, it can be, but usually isn't
- * null.
- */
- public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor, ValidationEvent event){
- // The reason that the resource and kind are still specified, is that I didn't want to remove a public method in the service
- // stream.
- return validate(resource, kind, operation, monitor);
- }
-
- /**
- * This method will be called before any validation takes place. It allows validators to perform any
- * initialization that they might need.
- *
- * @param project the project that is being validated. For the very first call in the validation phase,
- * this will be null. That is the signal to the validator that a top level validation is starting.
- * Subsequently, the project will be set, as each of the individual projects are validated.
- *
- * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
- * the next, during the validation phase.
- *
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){
- // subclasses need to override this, if they wish to let their validators know about this event
- }
-
- /**
- * This method will be called when validation is complete. It allows validators to perform any
- * cleanup that they might need to do.
- *
- * @param project the project that was validated. The very last call in the validation will set this to
- * null so that the validator knows that all the projects have now been validated.
- *
- * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
- * the next, during the validation phase.
- *
- * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
- */
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){
- // subclasses need to override this, if they wish to let their validators know about this event
- }
-
- void add(MessageSeveritySetting message){
- // I can't use getMessageSettings() here, as that will put us into an infinite loop
- if (_messageSettings == null){
- _messageSettings = new HashMap<String, MessageSeveritySetting>(10);
- }
- _messageSettings.put(message.getId(), message);
- bumpChangeCountMessages();
- }
-
- public IValidator asIValidator(){
- return null;
- }
-
- protected abstract boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper);
- protected abstract boolean shouldValidateProject(IProject project);
-
- public abstract String getId();
-
- public MessageSeveritySetting getMessage(String id){
- return getMessageSettings().get(id);
- }
-
- /**
- * Answer all the message settings that this validator has defined.
- *
- * @return an empty map if the validator did not define any message settings.
- */
- public Map<String, MessageSeveritySetting> getMessageSettings(){
- Map<String, MessageSeveritySetting> settings = _messageSettings;
- if (settings == null){
- settings = new HashMap<String, MessageSeveritySetting>(10);
- init(settings);
- if (ValManager.getDefault().mustUseGlobalValidators(getProject())){
- ValPrefManagerGlobal gp = ValPrefManagerGlobal.getDefault();
- gp.loadMessages(this, settings);
- }
- else {
- ValPrefManagerProject vp = new ValPrefManagerProject(getProject());
- vp.loadMessages(this, settings);
- }
- _messageSettings = settings;
- }
- return settings;
- }
-
- /**
- * Answer a hash code for the configurable fields so that we can quickly determine if two
- * validators are the same.
- */
- public int hashCodeForConfig(){
- int h = 0;
- if (_buildValidation)h += 101;
- if (_delegatingId != null)h += _delegatingId.hashCode();
- if (_manualValidation)h += 201;
- if (_messageSettings != null){
- for (MessageSeveritySetting ms : _messageSettings.values())h += ms.hashCode();
- }
- if (_sourceId != null)h += _sourceId.hashCode();
- h += _version;
- return h;
- }
-
- private void init(Map<String, MessageSeveritySetting> settings) {
- for (MessageSeveritySetting ms : ValidatorExtensionReader.getDefault().addMessages(this)){
- settings.put(ms.getId(), ms);
- }
- }
-
- public abstract String getName();
-
- /**
- * Answer the project that you were enabled on.
- *
- * @return null if you are a global (i.e. workspace level) validator.
- */
- public IProject getProject(){
- return _project;
- }
-
- /**
- * Answer the name of the class that implements the validator.
- */
- public abstract String getValidatorClassname();
-
- /**
- * Is this validator currently enabled for validations that are triggered manually?
- */
- public boolean isManualValidation() {
- return _manualValidation;
- }
-
- /**
- * Set whether this validator should be triggered as part of a manual validation.
- *
- * @param manualValidation
- * @return true if the setting changed.
- */
- public boolean setManualValidation(boolean manualValidation) {
- return setManualValidation2(manualValidation);
- }
-
- protected final boolean setManualValidation2(boolean manualValidation) {
- boolean changed = false;
- if (_manualValidation != manualValidation){
- bumpChangeCountGlobal();
- changed = true;
- _manualValidation = manualValidation;
- }
- return changed;
- }
-
- /**
- * Is this validator currently enabled for validations that are triggered by builds?
- */
- public boolean isBuildValidation() {
- return _buildValidation;
- }
-
- /**
- * Has the validator changed since it was last created or copied? Or was it migrated from an earlier version.
- */
- public boolean isChanged(){
- if (_changeCountGlobal > 0 || _changeCountMessages > 0 || _migrated)return true;
- return false;
- }
-
- /**
- * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that
- * plug-ins are not loaded too early.
- */
- abstract boolean isLoaded();
-
-
- /**
- * Set whether this validator should be triggered by the build process.
- *
- * @param buildValidation
- * @return true if the setting changed.
- */
- public boolean setBuildValidation(boolean buildValidation) {
- return setBuildValidation2(buildValidation);
- }
-
- protected final boolean setBuildValidation2(boolean buildValidation) {
- boolean changed = false;
- if (_buildValidation != buildValidation){
- bumpChangeCountGlobal();
- changed = true;
- _buildValidation = buildValidation;
- }
- return changed;
- }
-
- /**
- * Get the id of the "real" validator, that is the validator that will be called when this delegating
- * validator is asked to validate something. If this isn't a delegating validator answer null.
- */
- public String getDelegatingId() {
- return _delegatingId;
- }
-
- /**
- * Set the id of the "real" validator, that is the validator that will be called when this delegating
- * validator is asked to validate something.
- *
- * @param delegating the id of the validator that is actually going to perform the validation.
- */
- public void setDelegatingId(String delegating) {
- if (!Misc.same(_delegatingId, delegating)){
- _delegatingId = delegating;
- bumpChangeCountGlobal();
- }
- }
-
- public int getVersion() {
- return _version;
- }
-
- public void setVersion(int version) {
- if (_version != version){
- _version = version;
- bumpChangeCountGlobal();
- }
- }
-
- @Override
- public String toString() {
- return getName();
- }
-
-/**
- * A validator that uses version 1 of the validation framework.
- * @author karasiuk
- *
- */
-public static class V1 extends Validator {
- private ValidatorMetaData _vmd;
-
- /**
- * Create a new version 1 validator.
- * @param vmd
- * @param config this is used to set the global enablement options. In some case this can be null.
- */
- public V1(ValidatorMetaData vmd, ValidationConfiguration config, IProject project){
- super(project);
- _vmd = vmd;
- if (config != null){
- setBuildValidation(config.isBuildEnabled(vmd));
- setManualValidation(config.isManualEnabled(vmd));
- }
- setDelegatingId(ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_vmd.getValidatorUniqueName()));
- if (_vmd.getMarkerIds() != null && _vmd.getMarkerIds().length > 0)setMarkerId(_vmd.getMarkerIds()[0]);
- resetChangeCounters();
- }
-
- @Override
- public IValidator asIValidator() {
- IValidator v = null;
- try {
- v = _vmd.getValidator();
- }
- catch (InstantiationException e){
- ValidationPlugin.getPlugin().handleException(e);
- return null;
- }
- return v;
- }
-
- public V1 asV1Validator() {
- return this;
- }
-
- public Validator copy(boolean includeChangeCounts) {
- V1 v = new V1Copy(_vmd, null, _project);
- v.copyLocal(this, includeChangeCounts);
-
- return v;
- }
-
- public String getName() {
- return _vmd.getValidatorDisplayName();
- }
-
- public ValidatorMetaData getVmd(){
- return _vmd;
- }
-
- public String getValidatorClassname(){
- String name = ""; //$NON-NLS-1$
- try {
- name = _vmd.getValidator().getClass().getName();
- }
- catch (Exception e){
- // eat it
- }
- return name;
- }
- public String getId() {
- return _vmd.getValidatorUniqueName();
- }
-
- @Override
- boolean isLoaded() {
- return _vmd.isActive();
- }
-
- @Override
- public boolean setBuildValidation(boolean buildValidation) {
- boolean changed = super.setBuildValidation(buildValidation);
- _vmd.setBuildValidation(buildValidation);
- return changed;
- }
-
- @Override
- public boolean setManualValidation(boolean manualValidation) {
- boolean changed = super.setManualValidation(manualValidation);
- _vmd.setManualValidation(manualValidation);
- return changed;
- }
-
- @Override
- protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- return _vmd.isApplicableTo(resource);
- }
-
- @Override
- protected boolean shouldValidateProject(IProject project) {
- // TODO determine if this can be optimized
- return true;
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValOperation operation,
- IProgressMonitor monitor) {
-
- if (monitor == null)monitor = new NullProgressMonitor();
-
- ValidationResult vr = new ValidationResult();
- IValidator v = asIValidator();
- if (v == null)return null;
-
- try {
- IProject project = resource.getProject();
- SummaryReporter reporter = new SummaryReporter(project, monitor);
- IWorkbenchContext helper = _vmd.getHelper(project);
- if (helper instanceof WorkbenchContext){
- WorkbenchContext wc = (WorkbenchContext)helper;
- List<String> files = new LinkedList<String>();
- // [213631] The JSP validator expects full paths not relative paths, but the XML validator
- // expects relative paths.
- files.add(wc.getPortableName(resource));
- wc.setValidationFileURIs(files);
- }
- try {
- ValidatorLauncher.getLauncher().start(helper, v, reporter);
- }
- finally {
- try {
- v.cleanup(reporter);
- }
- finally {
- helper.cleanup(reporter);
- }
- }
-
- vr.incrementError(reporter.getSeverityHigh());
- vr.incrementWarning(reporter.getSeverityNormal());
- vr.incrementInfo(reporter.getSeverityLow());
-
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return vr;
- }
-
- /*
- * GRK - Because I didn't want to try to make a true copy of the V1 validator, (because I didn't
- * want to copy the vmd object), I came up with this approach to only copy the fields that
- * the preference page was worried about.
- */
- public final static class V1Copy extends V1 {
- public V1Copy(ValidatorMetaData vmd, ValidationConfiguration vc, IProject project){
- super(vmd, vc, project);
- }
-
- @Override
- public boolean setManualValidation(boolean bool) {
- return setManualValidation2(bool);
- }
-
- @Override
- public boolean setBuildValidation(boolean bool) {
- return setBuildValidation2(bool);
- }
-
- }
-
-}
-
-/**
- * A validator that uses version 2 of the validation framework.
- * @author karasiuk
- *
- */
-public final static class V2 extends Validator implements IAdaptable {
- private AbstractValidator _validator;
-
- private List<FilterGroup> _groups = new LinkedList<FilterGroup>();
- private FilterGroup[] _groupsArray;
-
- /** The full id of the extension. */
- private String _id;
-
- /** Name of the validator. */
- private String _name;
-
- /**
- * We don't want to create the validator too early, as it may trigger new plug-ins to be loaded.
- * We delay that as long as possible, by starting with just the config element.
- */
- private IConfigurationElement _validatorConfigElement;
-
- private String _validatorClassName;
-
- /**
- * An array containing the validator group IDs for which this validator is a member.
- */
- private String[] _validatorGroupIds;
-
- /**
- * If this validator is a delegating validator, then this is the "real" validator (i.e. the one that
- * does the work).
- */
- private AbstractValidator _delegated;
-
- /** How many times has a group field in this validator been changed since it was created (or copied)? */
- protected transient int _changeCountGroups;
-
- private Level _level;
-
- /**
- * Do we still need to invoke the validateStarting method for this validator, for the null project?
- *
- * Because we do not want to activate a validator's plug-in too soon, we do not activate the validator
- * as a reaction to the global validation starting event. Instead we mark it pending, and wait until
- * we are sure that we have something to validate.
- *
- * If this flag is true, it means that the validateStarting method still needs to be called for this validator.
- */
- private AtomicBoolean _pendingValidationStarted = new AtomicBoolean();
-
- V2(IConfigurationElement configElement, IProject project){
- super(project);
- assert configElement != null;
- _validatorConfigElement = configElement;
- _validatorClassName = configElement.getAttribute(ExtensionConstants.AttribClass);
-
- IConfigurationElement[] groupReferenceElements = configElement.getChildren(ExtensionConstants.Group.elementGroup);
- List<String> validatorGroupIDs = new ArrayList<String>();
- for (IConfigurationElement groupElement : groupReferenceElements) {
- String id = groupElement.getAttribute(ExtensionConstants.Group.attId);
- if (id != null)validatorGroupIDs.add(id);
- }
- _validatorGroupIds = validatorGroupIDs.toArray(new String[validatorGroupIDs.size()]);
-
- init();
- }
-
- private V2(IProject project, String validatorClassName, AbstractValidator validator){
- super(project);
- assert validator != null;
-
- _validatorClassName = validatorClassName;
- _validator = validator;
- init();
- }
-
- private void init(){
- try {
- String id = ConfigurationManager.getManager().getConfiguration(_project).getDelegateForTarget(_validatorClassName);
- if (id == null) id = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_validatorClassName);
- setDelegatingId(id);
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- resetChangeCounters();
- }
-
- public synchronized void add(FilterGroup fg) {
- assert fg != null;
- _groupsArray = null;
- _groups.add(fg);
- bumpChangeCountGroups();
- }
-
- @Override
- public IValidator asIValidator() {
- AbstractValidator av = getDelegatedValidator();
- if (av instanceof IValidator)return (IValidator)av;
- return super.asIValidator();
- }
-
- @Override
- public V2 asV2Validator() {
- return this;
- }
-
- /**
- * Let the validator know that a clean is about to happen.
- *
- * @param project the project that is being cleaned. This can be null which means that the workspace
- * is being cleaned (in which case a separate call will be made for each open project).
- *
- */
- @Override
- public void clean(IProject project, ValOperation operation, IProgressMonitor monitor) {
- getDelegatedValidator().clean(project, operation.getState(), monitor);
- }
-
- @Override
- public Validator copy(boolean includeChangeCounts) {
- V2 v = null;
- if (_validatorConfigElement != null)v = new V2(_validatorConfigElement, _project);
- else v = new V2(_project, _validatorClassName, _validator);
- v.copyLocal(this, includeChangeCounts);
-
- if (includeChangeCounts)v._changeCountGroups = _changeCountGroups;
-
- FilterGroup[] groups = getGroups();
- v._groupsArray = new FilterGroup[groups.length];
- for (int i=0; i<groups.length; i++){
- v._groupsArray[i] = groups[i];
- v._groups.add(groups[i]);
- }
-
- v._id = _id;
- v._name = _name;
- v._validatorGroupIds = _validatorGroupIds;
- v._pendingValidationStarted = _pendingValidationStarted;
-
- return v;
- }
-
- public int getChangeCountGroups(){
- return _changeCountGroups;
- }
-
- public void bumpChangeCountGroups(){
- _changeCountGroups++;
- }
-
- public Level getLevel() {
- return _level;
- }
-
- public void setLevel(Level level) {
- assert _level == null;
- _level = level;
- }
-
- /**
- * Answer the actual validator that is going to perform the validation. If this is a normal validator this
- * method will simply answer itself. However if this is a delegating validator, then this will answer the
- * "real" validator.
- */
- public AbstractValidator getDelegatedValidator(){
- AbstractValidator delegated = _delegated;
- if (delegated != null)return delegated;
- else if (getDelegatingId() == null)return getValidator();
- try {
- ValidatorDelegateDescriptor vdd = ValidatorDelegatesRegistry.getInstance()
- .getDescriptor(getValidatorClassname(), getDelegatingId());
- if (vdd == null)return getValidator();
- delegated = vdd.getValidator2();
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- delegated = new NullValidator();
- }
- delegated.setParent(this);
- _delegated = delegated;
- return delegated;
- }
-
- @Override
- public String getId() {
- return _id;
- }
-
- /**
- * Answer the validator's filter groups.
- * @return an empty array if the validator does not have any filter groups.
- */
- public synchronized FilterGroup[] getGroups(){
- FilterGroup[] groups = _groupsArray;
- if (groups == null){
- groups = new FilterGroup[_groups.size()];
- _groups.toArray(groups);
- _groupsArray = groups;
- }
- return groups;
- }
-
- @Override
- public String getName() {
- return _name;
- }
-
- public AbstractValidator getValidator() {
- if (_validator == null){
- try {
- _validator = (AbstractValidator)_validatorConfigElement.createExecutableExtension(ExtensionConstants.AttribClass);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- IContributor contrib = _validatorConfigElement.getContributor();
- String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- _validator = new NullValidator();
- }
- _validator.setParent(this);
- _validatorConfigElement = null;
-
- }
- return _validator;
- }
-
- @Override
- public String getValidatorClassname(){
- return _validatorClassName;
- }
-
- public String[] getValidatorGroups(){
- return _validatorGroupIds;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_id != null)h += _id.hashCode();
- if (_groups != null){
- for (FilterGroup fg : _groups)h += fg.hashCodeForConfig();
- }
- return h;
- }
-
- @Override
- public boolean isChanged() {
- if (_changeCountGroups > 0)return true;
- return super.isChanged();
- }
-
- @Override
- boolean isLoaded() {
- return _validator != null;
- }
-
- @Override
- public boolean shouldClearMarkers(ValidationEvent event) {
- return getValidator().shouldClearMarkers(event);
- }
-
- /**
- * Answer true if this validator, based on it's filters, should validate this resource.
- *
- * @return true if the resource should be validated.
- */
- @Override
- protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- FilterGroup[] groups = getGroups();
- IProject project = resource.getProject();
- for (FilterGroup group : groups){
- if (!group.shouldValidate(project, resource, contentTypeWrapper))return false;
- }
- return true;
- }
-
-
- @Override
- public void setDelegatingId(String delegating) {
- super.setDelegatingId(delegating);
- _delegated = null;
- }
-
- public synchronized void setGroups(List<FilterGroup> groups){
- _groups = groups;
- _groupsArray = null;
- bumpChangeCountGroups();
- }
-
- public void setId(String id) {
- if (!Misc.same(_id, id)){
- _id = id;
- bumpChangeCountGlobal();
- }
- }
-
- public void setName(String name) {
- if (!Misc.same(_name, name)){
- _name = name;
- bumpChangeCountGlobal();
- }
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor){
- return validate(resource, kind, operation, monitor, null);
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor, ValidationEvent event) {
- ValidationResult vr = null;
- if (operation == null)operation = new ValOperation();
- if (monitor == null)monitor = new NullProgressMonitor();
- try {
- if (event == null)event = new ValidationEvent(resource, kind, null);
- vr = getDelegatedValidator().validate(event, operation.getState(), monitor);
- if (vr == null)vr = getDelegatedValidator().validate(resource, kind, operation.getState(), monitor);
- }
- catch (Exception e){
- try {
- String msg = NLS.bind(ValMessages.LogValEnd, getName(), resource.getLocationURI());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, msg);
- }
- catch (Exception e2 ){
- // ignore it
- }
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- if (vr != null){
- if (vr.getValidationException() != null){
- ValidationPlugin.getPlugin().handleException(vr.getValidationException());
- }
- updateResults(vr);
- if (vr.getDependsOn() != null){
- ValidationFramework.getDefault().getDependencyIndex().set(getId(), resource, vr.getDependsOn());
- }
- IResource[] validated = vr.getValidated();
- if (validated != null){
- for (int i=0; i<validated.length; i++){
- operation.addValidated(getId(), validated[i]);
- }
- }
-
- ValidatorMessage[] msgs = vr.getMessages();
-// if (sanityTest(msgs.length, resource)){
- MarkerManager mm = MarkerManager.getDefault();
- for (ValidatorMessage m : msgs){
- mm.createMarker(m, getId());
- }
-// }
-// else {
-// setBuildValidation(false);
-// setManualValidation(false);
-// }
- }
- return vr;
- }
-
- /**
- * Perform a simple sanity test to ensure that the validator is configured correctly.
- * @param numberofMessages number of messages that the validator produced.
- * @return true if the test passed
- */
-// private boolean sanityTest(int numberofMessages, IResource resource) {
-// if (numberofMessages < 201)return true;
-//
-// String resName = ""; //$NON-NLS-1$
-// if (resource != null)resName = resource.getName();
-// String message = NLS.bind(ValMessages.ConfigError, new Object[]{
-// getName(), getId(), String.valueOf(numberofMessages), resName});
-// ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
-//
-// return false;
-// }
-
- /**
- * If the validator is using a report helper then update it with any of the messages that were
- * added directly to the validation result.
- * @param vr
- */
- private void updateResults(ValidationResult vr) {
- ReporterHelper rh = vr.getReporterHelper();
- if (rh == null)return;
- ClassLoader classloader = getDelegatedValidator().getClass().getClassLoader();
- for (IMessage message : rh.getMessages()){
- Object target = message.getTargetObject();
- if (target != null){
- IResource res = null;
- if (target instanceof IResource)res = (IResource)target;
- if (res == null){
- target = message.getAttribute(IMessage.TargetResource);
- if (target != null && target instanceof IResource)res = (IResource)target;
- }
- if (res != null){
-
- ValidatorMessage vm = ValidatorMessage.create(message.getText(classloader), res);
- if (getMarkerId() != null)vm.setType(getMarkerId());
- vr.add(vm);
- int markerSeverity = IMarker.SEVERITY_INFO;
- int sev = message.getSeverity();
- if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
- else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
- vm.setAttribute(IMarker.SEVERITY, markerSeverity);
- vm.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
- int offset = message.getOffset();
- if (offset != IMessage.OFFSET_UNSET){
- vm.setAttribute(IMarker.CHAR_START, offset);
- int len = message.getLength();
- if (len != IMessage.OFFSET_UNSET){
- vm.setAttribute(IMarker.CHAR_START, offset);
- vm.setAttribute(IMarker.CHAR_END, offset+len);
- }
- }
- String groupName = message.getGroupName();
- if (groupName != null){
- vm.setAttribute(ConfigurationConstants.VALIDATION_MARKER_GROUP, groupName);
- }
-
- copyAttributes(message, vm);
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private void copyAttributes(IMessage message, ValidatorMessage vm) {
- // I made this a separate method, so that I could localize the suppression of unchecked warnings.
- Map attributes = message.getAttributes();
- if (attributes != null){
- for (Iterator it = attributes.entrySet().iterator(); it.hasNext();){
- Map.Entry me = (Map.Entry)it.next();
- String key = (String)me.getKey();
- vm.setAttribute(key, me.getValue());
- }
- }
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null)_pendingValidationStarted.set(true);
- else {
- AbstractValidator val = getDelegatedValidator();
- if (_pendingValidationStarted.getAndSet(false)){
- val.validationStarting(null, state, monitor);
- }
- val.validationStarting(project, state, monitor);
- }
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null){
- if (!_pendingValidationStarted.getAndSet(false))getDelegatedValidator().validationFinishing(null, state, monitor);
- }
- else getDelegatedValidator().validationFinishing(project, state, monitor);
- }
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public synchronized void remove(FilterGroup group) {
- _groups.remove(group);
- _groupsArray = null;
- bumpChangeCountGroups();
- }
-
- @Override
- public void resetChangeCounters() {
- super.resetChangeCounters();
- _changeCountGroups = 0;
- }
-
- @Override
- protected boolean shouldValidateProject(IProject project) {
- FilterGroup[] groups = getGroups();
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (FilterGroup group : groups){
- if (!group.shouldValidate(project, null, ctw))return false;
- }
- return true;
- }
-
- public synchronized void replaceFilterGroup(FilterGroup existing, FilterGroup merged) {
- remove(existing);
- add(merged);
- }
-
-}
-
-public String getSourceId() {
- return _sourceId;
-}
-
-public void setSourceId(String sourceId) {
- if (!Misc.same(_sourceId, sourceId)){
- _sourceId = sourceId;
- bumpChangeCountGlobal();
- }
-}
-
-
-void setMessages(Map<String, MessageSeveritySetting> map) {
- _messageSettings = map;
- bumpChangeCountMessages();
-}
-
-public int getChangeCountGlobal() {
- return _changeCountGlobal;
-}
-
-public boolean hasGlobalChanges(){
- return _migrated || _changeCountGlobal > 0;
-}
-
-public int getChangeCountMessages() {
- return _changeCountMessages;
-}
-
-public void bumpChangeCountMessages(){
- _changeCountMessages++;
-}
-
-public void resetChangeCounters() {
- _changeCountGlobal = 0;
- _changeCountMessages = 0;
-}
-
-public void bumpChangeCountGlobal(){
- _changeCountGlobal++;
-}
-
-/**
- * Answer true if you have the same configuration settings as validator.
- * @param validator this can be null.
- */
-public boolean sameConfig(Validator validator) {
- if (validator == null)return false;
- return hashCodeForConfig() == validator.hashCodeForConfig();
-}
-
-public String getMarkerId() {
- return _markerId;
-}
-
-public void setMarkerId(String markerId) {
- _markerId = markerId;
- if (markerId != null)MarkerManager.getDefault().getMarkers().add(markerId);
-}
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
deleted file mode 100644
index b8146dc..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
+++ /dev/null
@@ -1,295 +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;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValConstants;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This class provides a way for a validator to return messages, that are easily
- * converted into IMarkers.
- * <p>
- * This class is completely optional for validators. A validator can choose to
- * directly manage IMarkers. However, some validators want to be used in
- * multiple contexts, for example as-you-type validation and build based
- * validation. For these types of validators it is not possible for them to use
- * only IMarkers, because often the Resource has not been saved yet.
- * </p>
- * <p>
- * <b>Provisional API:</b> This class/interface 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.
- * </p>
- */
-public class ValidatorMessage {
-
- public static final String ValidationId = "ValidationId"; //$NON-NLS-1$
-
- /** Associate some arbitrary attributes with a message. */
- private final Map<String, Object> _map = new HashMap<String, Object>(5);
-
- private IResource _resource;
-
- /** The type of marker. */
- private String _type;
-
- /**
- * Create a new validation message.
- *
- * @param message
- * The localized message that will be displayed to the user.
- *
- * @param resource
- * The resource that the message is associated with.
- */
- public static ValidatorMessage create(String message, IResource resource){
- ValidatorMessage msg = new ValidatorMessage();
- msg._type = ValConstants.ProblemMarker;
- msg._resource = resource;
- msg.setAttribute(IMarker.MESSAGE, ValidationPlugin.getPlugin().isDebugging() ?
- Tracing.timestampIt(message): message);
- return msg;
- }
-
- private ValidatorMessage(){}
-
- /**
- * Answer a copy of yourself.
- */
- public ValidatorMessage asCopy(){
- ValidatorMessage msg = new ValidatorMessage();
- msg._resource = _resource;
- msg._type = _type;
- msg._map.putAll(_map);
- return msg;
- }
-
- /**
- * Returns the attribute with the given name. The result is an instance of
- * one of the following classes: <code>String</code>, <code>Integer</code>,
- * or <code>Boolean</code>. Returns <code>null</code> if the attribute is
- * undefined.
- *
- * @param attributeName
- * The name of the attribute.
- * @return the value, or <code>null</code> if the attribute is undefined.
- */
- public Object getAttribute(String attributeName){
- return _map.get(attributeName);
- }
-
- /**
- * Returns the integer valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not an integer value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no integer value is found.
- * @return the value or the default value if no integer value was found.
- */
- public int getAttribute(String attributeName, int defaultValue){
- Integer value = null;
- try {
- value = (Integer)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value.intValue();
- }
-
- /**
- * Returns the string valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not a string value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no value is found.
- * @return the value or the default value if no value was found.
- */
- public String getAttribute(String attributeName, String defaultValue){
- String value = null;
- try {
- value = (String)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value;
-
- }
-
- /**
- * Returns the boolean valued attribute with the given name. Returns the
- * given default value if the attribute is undefined or the marker does not
- * exist or is not a boolean value.
- *
- * @param attributeName
- * The name of the attribute.
- * @param defaultValue
- * The value to use if no value is found.
- * @return the value or the default value if no value was found.
- */
- public boolean getAttribute(String attributeName, boolean defaultValue){
- Boolean value = null;
- try {
- value = (Boolean)_map.get(attributeName);
- }
- catch (Exception e){
- // eat it
- }
- if (value == null)return defaultValue;
- return value.booleanValue();
-
- }
-
- /**
- * Returns a map with all the attributes for the marker. If the marker has
- * no attributes then <code>null</code> is returned.
- *
- * @return a map of attribute keys and values (key type :
- * <code>String</code> value type : <code>String</code>,
- * <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
- */
- @SuppressWarnings("unchecked")
- public Map getAttributes() {
- return _map;
- }
-
- /**
- * Returns the resource with which this marker is associated.
- *
- * @return the resource with which this marker is associated
- */
- public IResource getResource(){
- return _resource;
- }
-
- /**
- * Returns the type of this marker. The returned marker type will not be
- * <code>null</code>.
- *
- * @return the type of this marker
- */
- public String getType() {
- return _type;
- }
-
- /**
- * Sets the marker type.
- *
- * @param type The marker id to use when creating new markers.
- */
- public void setType(String type){
- assert type != null;
- _type = type;
- }
-
- /**
- * Sets the integer valued attribute with the given name.
- * <p>
- * This method changes resources; these changes will be reported in a
- * subsequent resource change event, including an indication that this
- * marker has been modified.
- * </p>
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value.
- */
- public void setAttribute(String attributeName, int value){
- _map.put(attributeName, new Integer(value));
-
- }
-
- /**
- * Sets the attribute with the given name. The value must be
- * <code>null</code> or an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value, or <code>null</code> if the attribute is to be undefined.
- */
- public void setAttribute(String attributeName, Object value){
- _map.put(attributeName, value);
- }
-
- /**
- * Sets the boolean valued attribute with the given name.
- *
- * @param attributeName
- * The name of the attribute.
- * @param value
- * The value.
- */
- public void setAttribute(String attributeName, boolean value){
- _map.put(attributeName, value ? Boolean.TRUE : Boolean.FALSE);
- }
-
- /**
- * Sets the given attribute key-value pairs on this marker. The values must
- * be <code>null</code> or an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>. If a
- * value is <code>null</code>, the new value of the attribute is considered
- * to be undefined.
- *
- * @param attributeNames
- * An array of attribute names.
- * @param values
- * An array of attribute values.
- */
- public void setAttributes(String[] attributeNames, Object[] values){
- Assert.isTrue(attributeNames.length == values.length);
- for (int i=0; i<attributeNames.length; i++){
- setAttribute(attributeNames[i], values[i]);
- }
- }
-
- /**
- * Sets the attributes for this marker to be the ones contained in the given
- * table. The values must be an instance of one of the following classes:
- * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
- * Attributes previously set on the marker but not included in the given map
- * are considered to be removals. Setting the given map to be
- * <code>null</code> is equivalent to removing all marker attributes.
- *
- * @param attributes
- * A map of attribute names to attribute values (key type :
- * <code>String</code> value type : <code>String</code>,
- * <code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
- */
- public void setAttributes(Map<String, Object> attributes) {
- _map.clear();
- _map.putAll(attributes);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
deleted file mode 100644
index 2436c84..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Since it can be expense to determine a content type, we provide a wrapper so that we only
- * need to get it once, as we validate a resource.
- * @author karasiuk
- *
- */
-public class ContentTypeWrapper {
-
- private IContentType _type;
- private boolean _initialized;
-
- public IContentType getContentType(IFile file){
- if (_initialized)return _type;
-
- IContentDescription cd = null;
- try {
- cd = file.getContentDescription();
- }
- catch (CoreException e){
- try {
- file.refreshLocal(IResource.DEPTH_ZERO, null);
- cd = file.getContentDescription();
- }
- catch (CoreException e2){
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e2);
- }
- }
- if (cd == null)return null;
- _type = cd.getContentType();
- _initialized = true;
- return _type;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
deleted file mode 100644
index a466241..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public interface DebugConstants {
-
- /** matches - trace filter matches. */
- String TraceMatches = ValidationPlugin.PLUGIN_ID+"/matches"; //$NON-NLS-1$
-
- /** timings - trace the times of the validators. */
- String TraceTimes = ValidationPlugin.PLUGIN_ID+"/timings"; //$NON-NLS-1$
-
- /** v1 - trace the v1 validators. */
- String TraceV1 = ValidationPlugin.PLUGIN_ID+"/v1"; //$NON-NLS-1$
-
- /** timings/tracefile - file that stores the trace events */
- String TraceTimesFile = ValidationPlugin.PLUGIN_ID+"/timings/tracefile"; //$NON-NLS-1$
-
- /**
- * timings/useDoubles - By default times that are written to the trace file are
- * in milliseconds for elapsed time and nanoseconds for cpu time.
- * If you find these times easier to read as seconds as expressed by a double,
- * the following flag can be turned on.
- */
- String TraceTimesUseDoubles = ValidationPlugin.PLUGIN_ID+"/timings/useDoubles"; //$NON-NLS-1$
-
- /**
- * extraValDetail - If extra detail is needed for a particular validator it's id can be specified here.
- * For example, if you wanted more detail on the XML validator you would use org.eclipse.wst.xml.core.xml
- */
- String ExtraValDetail = ValidationPlugin.PLUGIN_ID+"/extraValDetail"; //$NON-NLS-1$
-
- /**
- * filter/allExcept - If supplied, it is as if this is the only validator that gets defined via
- * the extension point. All the other validators are ignored.
- */
- String FilterAllExcept = ValidationPlugin.PLUGIN_ID+"/filter/allExcept"; //$NON-NLS-1$
-
- /**
- * trace/level - The tracing level. If not supplied a default of zero is used. The higher the number the
- * more verbose the tracing.
- */
- String TraceLevel = ValidationPlugin.PLUGIN_ID+"/trace/level"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
deleted file mode 100644
index 279f2fb..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
+++ /dev/null
@@ -1,377 +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.internal;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-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.ISaveContext;
-import org.eclipse.core.resources.ISaveParticipant;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.DependentResource;
-import org.eclipse.wst.validation.IDependencyIndex;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * A simple implementation of the IDependencyIndex. This will probably be
- * replaced with a higher performance, more robust index, at some point in the
- * future.
- * <p>
- * The format of the index is:
- *
- * <pre>
- * Version number
- * Number of depends on entries
- * depends on file name
- * number of dependent entries
- * dependent file name
- * number of validators
- * validator id
- * </pre>
- *
- * @author karasiuk
- */
-public class DependencyIndex implements IDependencyIndex, ISaveParticipant {
-
- /**
- * An index so that we can determine which things depend on this resource.
- */
- private Map<IResource,Set<Depends>> _dependsOn;
-
- /**
- * An index so that we can determine who the resource depends on.
- */
- private Map<IResource,Set<Depends>> _dependents;
- private boolean _dirty;
-
- private static IResource[] EmptyResources = new IResource[0];
-
- /** Version of the persistent index. */
- private static final int CurrentVersion = 1;
-
- public synchronized void add(String id, IResource dependent, IResource dependsOn) {
- init();
- if (dependsOn == null || dependent == null)return;
- Depends d = getOrCreateDepends(dependent, dependsOn);
- if (d.getValidators().add(id))_dirty = true;
- }
-
- private Depends getOrCreateDepends(IResource dependent, IResource dependsOn) {
- Set<Depends> set = getSet(_dependents, dependent);
- for (Depends d : set){
- if (d.getDependsOn() != null && d.getDependsOn().equals(dependsOn)) return d;
- }
- Depends d = new Depends(dependent, dependsOn);
- _dirty = true;
- set.add(d);
-
- getSet(_dependsOn, dependsOn).add(d);
- return d;
- }
-
- /**
- * Answer the set for the resource, creating it if you need to.
- */
- private Set<Depends> getSet(Map<IResource, Set<Depends>> map, IResource resource) {
- Set<Depends> set = map.get(resource);
- if (set == null){
- set = new HashSet<Depends>(5);
- map.put(resource, set);
- }
- return set;
- }
-
- /**
- * Restore the dependency index. See the class comment for the structure.
- */
- private void init() {
- if (_dependsOn != null)return;
-
- boolean error = false;
- File f = getIndexLocation();
- if (!f.exists()){
- _dependsOn = new HashMap<IResource,Set<Depends>>(100);
- _dependents = new HashMap<IResource,Set<Depends>>(100);
- }
- else {
- String errorMessage = "The following dependency could not be restored " +
- "because the following resource {0} could no longer be found.";
- DataInputStream in = null;
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- in = new DataInputStream(new FileInputStream(f));
-
- int version = in.readInt();
- if (version != CurrentVersion){
- error = true;
- String msg = NLS.bind(ValMessages.ErrDependencyVersion, CurrentVersion);
- throw new IllegalStateException(msg);
- }
- int numDependsOn = in.readInt();
- _dependsOn = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
- _dependents = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
- for (int i=0; i<numDependsOn; i++){
- String v = in.readUTF();
- IResource dependsOn = root.findMember(v);
- if (dependsOn == null){
- Tracing.log(NLS.bind(errorMessage, v));
- }
- int numDependents = in.readInt();
- for (int j=0; j<numDependents; j++){
- v = in.readUTF();
- IResource dependent = root.findMember(v);
- if (dependent == null){
- Tracing.log(NLS.bind(errorMessage, v));
- }
- int numVal = in.readInt();
- for (int k=0; k<numVal; k++){
- String id = in.readUTF();
- if (dependent != null && dependsOn != null)add(id, dependent, dependsOn);
- }
- }
- }
- }
- catch (EOFException e){
- Tracing.log("Unable to read the dependency index file because of EOF exception");
- }
- catch (IOException e){
- error = true;
- ValidationPlugin.getPlugin().handleException(e);
- }
- finally {
- Misc.close(in);
- if (error){
- _dependsOn = new HashMap<IResource,Set<Depends>>(100);
- _dependents = new HashMap<IResource,Set<Depends>>(100);
- f.delete();
- }
- }
- }
- }
-
- public synchronized void clear(IProject project) {
- init();
- for (Map.Entry<IResource,Set<Depends>> me : _dependents.entrySet()){
- if (me.getKey().getProject() == project){
- for (Depends d : me.getValue()){
- if (d.delete())_dirty = true;
- }
- }
- }
- }
-
- public synchronized IResource[] get(String validatorId, IResource dependsOn) {
- init();
- List<IResource> list = new LinkedList<IResource>();
- Set<Depends> set = getSet(_dependsOn, dependsOn);
- for (Depends d : set){
- for (String id : d.getValidators()){
- if (validatorId.equals(id))list.add(d.getDependent());
- }
- }
-
- if (list.size() == 0)return EmptyResources;
- IResource[] resources = new IResource[list.size()];
- list.toArray(resources);
- return resources;
- }
-
-
- public synchronized List<DependentResource> get(IResource dependsOn) {
- init();
- List<DependentResource> list = new LinkedList<DependentResource>();
- Set<Depends> set = getSet(_dependsOn, dependsOn);
- ValManager vm = ValManager.getDefault();
- for (Depends d : set){
- for (String id : d.getValidators()){
- Validator v = vm.getValidator(id, d.getDependent().getProject());
- if (v != null)list.add(new DependentResource(d.getDependent(), v));
- }
- }
- return list;
- }
-
-
- public synchronized void set(String id, IResource dependent, IResource[] dependsOn) {
- init();
- Set<Depends> set = getSet(_dependents, dependent);
- for (Depends d : set){
- if (d.delete(id))_dirty = true;
- }
- if (dependsOn != null){
- for (IResource d : dependsOn)add(id, dependent, d);
- }
- }
-
- public boolean isDependedOn(IResource resource) {
- init();
- Set<Depends> set = _dependsOn.get(resource);
- if (set == null || set.size() == 0)return false;
- return true;
- }
-
- public void doneSaving(ISaveContext context) {
- }
-
- public void prepareToSave(ISaveContext context) throws CoreException {
- }
-
- public void rollback(ISaveContext context) {
- }
-
- /**
- * Persist the dependency index. See the class comment for the structure.
- */
- public synchronized void saving(ISaveContext context) throws CoreException {
- if (!_dirty)return;
- _dirty = false;
- boolean error = false;
- DataOutputStream out = null;
- File f = null;
- try {
- f = getIndexLocation();
- out = new DataOutputStream(new FileOutputStream(f));
- out.writeInt(CurrentVersion);
- Map<String, Set<DependsResolved>> map = compress(_dependsOn);
- out.writeInt(map.size());
- for (Map.Entry<String, Set<DependsResolved>> me : map.entrySet()){
- out.writeUTF(me.getKey());
- Set<DependsResolved> set = me.getValue();
- out.writeInt(set.size());
- for (DependsResolved d : set){
- out.writeUTF(d.resource);
- out.writeInt(d.validators.size());
- for (String id : d.validators){
- out.writeUTF(id);
- }
- }
- }
- }
- catch (IOException e){
- error = true;
- ValidationPlugin.getPlugin().handleException(e);
- }
- finally {
- Misc.close(out);
- if (error)f.delete();
- }
- }
-
- private Map<String, Set<DependsResolved>> compress(Map<IResource, Set<Depends>> dependsOn) {
- Map<String, Set<DependsResolved>> map = new HashMap<String, Set<DependsResolved>>(dependsOn.size());
- for (Map.Entry<IResource, Set<Depends>> me : dependsOn.entrySet()){
- Set<DependsResolved> set = new HashSet<DependsResolved>(me.getValue().size());
- for (Depends d : me.getValue()){
- IPath path = d.getDependent().getFullPath();
- if (path != null){
- DependsResolved dr = new DependsResolved();
- dr.resource = path.toPortableString();
- if (d.getValidators().size() > 0){
- dr.validators = d.getValidators();
- set.add(dr);
- }
- }
- }
- if (set.size() > 0){
- IResource res = me.getKey();
- if (res != null){
- IPath path = res.getFullPath();
- if (path != null)map.put(path.toPortableString(), set);
- }
- }
- }
- return map;
- }
-
- private File getIndexLocation() {
- IPath path = ValidationPlugin.getPlugin().getStateLocation().append("dep.index"); //$NON-NLS-1$
- return path.toFile();
- }
-
- /**
- * Keep track of a relationship between a dependent and the thing that it
- * depends on.
- *
- * @author karasiuk
- *
- */
- private static class Depends {
-
- /** The resource that is being depended on, for example a.xsd */
- private IResource _dependsOn;
-
- /** The resource that is dependent, for example a.xml */
- private IResource _dependent;
-
- /** The id's of the validators that have asserted the dependency. */
- private Set<String> _validators;
-
- public Depends(IResource dependent, IResource dependsOn) {
- _dependent = dependent;
- _dependsOn = dependsOn;
- _validators = new HashSet<String>(5);
- }
-
- /**
- * Answer true if the id was deleted.
- */
- public boolean delete(String id) {
- return _validators.remove(id);
- }
-
- /**
- * Delete all the dependency assertions for all of your validators.
- * @return false if there was nothing to delete
- */
- public boolean delete() {
- boolean deleted = _validators.size() > 0;
- if (deleted)_validators.clear();
- return deleted;
- }
-
- public IResource getDependsOn() {
- return _dependsOn;
- }
-
- public IResource getDependent() {
- return _dependent;
- }
-
- public Set<String> getValidators() {
- return _validators;
- }
-}
-
- private static class DependsResolved {
- String resource;
- Set<String> validators;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
deleted file mode 100644
index b1af963..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
+++ /dev/null
@@ -1,63 +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.internal;
-
-/**
- * A simple deserializer that knows how to retrieve booleans, integers and strings, from a string
- * that was encoded by the Serializer class.
- *
- * @see Serializer
- * @author karasiuk
- *
- */
-public class Deserializer {
- private char[] _buffer;
- private int _posn;
-
- public Deserializer(String value){
- _buffer = value.toCharArray();
- }
-
- public boolean getBoolean(){
- boolean result = false;
- if (_buffer[_posn] == 'T')result = true;
- else if (_buffer[_posn] == 'F')result = false;
- else throw new IllegalStateException(ValMessages.DecodeError1);
-
- _posn++;
- return result;
- }
-
- public String getString(){
- int len = getInt();
- String result = new String(_buffer, _posn, len);
- _posn += len;
- return result;
- }
-
- public int getInt(){
- Integer len = new Integer(String.valueOf(_buffer[_posn]));
- _posn++;
-
- String s = String.valueOf(_buffer, _posn, len+1);
- _posn += len+1;
- return Integer.parseInt(s);
- }
-
- /**
- * Are there any more items?
- * @return
- */
- public boolean hasNext() {
- if (_posn >= _buffer.length)return false;
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
deleted file mode 100644
index 120180f..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
+++ /dev/null
@@ -1,158 +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.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Validators can assert that certain resources (usually folders) are not validated. This class keeps track of those
- * assertions.
- * @author karasiuk
- *
- */
-public class DisabledResourceManager implements IProjectChangeListener {
-
- public static DisabledResourceManager getDefault(){
- return Singleton.disabledResourceManager;
- }
-
- private Set<IResource> _disabled = new HashSet<IResource>(100);
- private Set<IProject> _loadedProjects = new HashSet<IProject>(40);
-
- private DisabledResourceManager(){
- EventManager.getManager().addProjectChangeListener(this);
- }
-
- public void disableValidation(IResource resource){
- // We check for two reasons, 1) we may save some work, 2) we force the project to be loaded
- if (isDisabled(resource))return;
-
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
- copy.addAll(_disabled);
- copy.add(resource);
- save(copy, resource.getProject());
- _disabled = copy;
- }
-
- public void enableValidation(IResource resource){
- // We check for two reasons, 1) we may save some work, 2) we force the project to be loaded
- if (!isDisabled(resource))return;
-
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
- copy.addAll(_disabled);
- copy.remove(resource);
- save(copy, resource.getProject());
- _disabled = copy;
- }
-
- private void save(Set<IResource> disabled, IProject project) {
- Serializer ser = new Serializer(200);
- for (IResource resource : disabled){
- if (project == resource.getProject()){
- ser.put(resource.getProjectRelativePath().toPortableString());
- }
- }
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
- prefs.put(PrefConstants.disabled, ser.toString());
- try {
- prefs.flush();
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- private void load(IProject project){
- Set<IResource> copy = new HashSet<IResource>(_disabled.size()+10);
- copy.addAll(_disabled);
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
- String disabled = prefs.get(PrefConstants.disabled, ""); //$NON-NLS-1$
- if (disabled.length() > 0){
- Deserializer des = new Deserializer(disabled);
- while(des.hasNext()){
- String pathString = des.getString();
- IPath path = Path.fromPortableString(pathString);
- IResource resource = project.findMember(path);
- copy.add(resource);
- }
- }
- _disabled = copy;
- }
-
- public void dispose(){
- EventManager.getManager().removeProjectChangeListener(this);
- }
-
- /**
- * Answer true if this resource should not be validated.
- *
- * @param resource the resource that is being tested.
- * @return true if the resource should not be validated.
- */
- public boolean isDisabled(IResource resource){
- IProject project = resource.getProject();
- if (_loadedProjects.contains(project))return _disabled.contains(resource);
- return isDisabled(resource, project);
- }
-
- private synchronized boolean isDisabled(IResource resource, IProject project){
- if (!_loadedProjects.contains(project)){
- load(project);
- _loadedProjects.add(project);
- }
- return _disabled.contains(resource);
- }
-
- public void addDisabled(IResource resource){
- _disabled.add(resource);
- }
-
- public void projectChanged(IProject project, int type) {
- switch (type) {
- case IProjectChangeListener.ProjectDeleted:
- case IProjectChangeListener.ProjectClosed:
- projectRemoved(project);
- break;
-
- }
-
- }
-
- private synchronized void projectRemoved(IProject project) {
- _loadedProjects.remove(project);
- Set<IResource> copy = new HashSet<IResource>(100);
- for (IResource resource : _disabled){
- if (resource.getProject() != project)copy.add(resource);
- }
- _disabled = copy;
- }
-
- /**
- * Store the singleton for the DisabledResourceManager. This approach is used to avoid having to synchronize the
- * DisabledResourceManager.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private static class Singleton {
- static DisabledResourceManager disabledResourceManager = new DisabledResourceManager();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
deleted file mode 100644
index 7505e88..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * Keep track of the disabled validators.
- * @author karasiuk
- *
- */
-public final class DisabledValidatorManager implements IValChangedListener {
-
- private static final AtomicInteger _counter = new AtomicInteger();
- private static final int CacheSize = 5;
-
- private final Map<IResource, LRUSet> _map = Collections.synchronizedMap(new HashMap<IResource, LRUSet>(5));
-
- public static DisabledValidatorManager getDefault(){
- return Singleton.disabledValidatorManager;
- }
-
- private DisabledValidatorManager(){
- ValPrefManagerProject.addListener(this);
- }
-
- /*
- * Although this is currently not called, it should be if this ever stops being a singleton.
- */
- public void dispose(){
- ValPrefManagerProject.removeListener(this);
- }
-
- public Set<Validator> getDisabledValidatorsFor(IResource resource) {
- LRUSet set = _map.get(resource);
- if (set != null){
- set.counter = _counter.getAndIncrement();
- return set.validators;
- }
-
- DisabledValidationFinder dvf = new DisabledValidationFinder();
- Set<Validator> vset = dvf.findDisabledValidatorsFor(resource);
- insert(resource, vset);
- return vset;
- }
-
- private synchronized void insert(IResource resource, Set<Validator> vset) {
- if (_map.size() >= CacheSize ){
- IResource oldest = null;
- int current = Integer.MAX_VALUE;
- for (Map.Entry<IResource, LRUSet> me : _map.entrySet()){
- if (me.getValue().counter < current){
- oldest = me.getKey();
- current = me.getValue().counter;
- }
- }
- _map.remove(oldest);
- }
- LRUSet set = new LRUSet();
- set.counter = _counter.getAndIncrement();
- set.validators = vset;
- _map.put(resource, set);
- }
-
-
- private final static class LRUSet {
- int counter;
- Set<Validator> validators;
- }
-
- private final static class DisabledValidationFinder implements IValidatorVisitor {
-
- private Map<String, Validator> _validators;
-
- public void visit(Validator validator, IProject project, ValType valType, ValOperation operation,
- IProgressMonitor monitor) {
-
- _validators.remove(validator.getId());
-
- }
-
- public Set<Validator> findDisabledValidatorsFor(IResource resource) {
- ValManager vm = ValManager.getDefault();
- Validator[] vals = vm.getValidatorsCopy();
- _validators = new HashMap<String, Validator>(100);
- for (Validator v : vals)_validators.put(v.getId(), v);
-
- IProject project = resource.getProject();
- vm.accept(this, project, resource, ValType.Build, new ValOperation(), new NullProgressMonitor());
- Set<Validator> set = new HashSet<Validator>(_validators.size());
- set.addAll(_validators.values());
- return set;
- }
-
-
- }
-
- public void validatorsForProjectChanged(IProject project, boolean configSettingChanged) {
- _map.clear();
- }
-
-
- /**
- * Store the singleton for the DisabledValidatorManager. This approach is used to avoid having to synchronize the
- * DisabledValidatorManager.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private final static class Singleton {
- final static DisabledValidatorManager disabledValidatorManager = new DisabledValidatorManager();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
deleted file mode 100644
index e702471..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * Constants used in the extension points.
- * @author karasiuk
- *
- */
-public interface ExtensionConstants {
-
- /** validatorV2 - extension point for registering validators that use version 2 of the validation framework. */
- String validator = "validatorV2"; //$NON-NLS-1$
-
- /** exclude - extension point for adding extra exclusion filters to a validator. */
- String excludeExtension = "exclude"; //$NON-NLS-1$
-
- /** build - is the validator enabled by default for build based validations? true or false */
- String build = "build"; //$NON-NLS-1$
-
- /** class - name of the attribute that holds the validator class. */
- String AttribClass = "class"; //$NON-NLS-1$
-
- /** manual - is the validator enabled by default for manual based validations? true or false */
- String manual = "manual"; //$NON-NLS-1$
-
- /**
- * markerId - the marker id that the framework should use when creating customized markers for this validator.
- * This is an optional attribute. If it is not supplied than the standard validation marker type will be used.
- */
- String markerId = "markerId"; //$NON-NLS-1$
-
- /**
- * sourceid - If this validator also serves as an as-you-type validator (also know as an ISourceValidator)
- * then it's source id is specified here, so that the two validators can be associated with one
- * another. By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation
- * extension point.
- */
- String sourceId = "sourceid"; //$NON-NLS-1$
-
- /**
- * version - the version of this definition. The attribute is a simple integer, and if not specified it
- * is assumed to be 1. This allows the filter settings to be changed in the future.
- */
- String version = "version"; //$NON-NLS-1$
-
- /**
- * include - a group of inclusion rules. At least one rule in this group needs to match in order for the resource
- * to to considered to be validated.
- */
- String include = "include"; //$NON-NLS-1$
-
- /** exclude - a group of exclusion rules. If any of these rules match the resource is not validated. */
- String exclude = "exclude"; //$NON-NLS-1$
-
- /** rules - a group of inclusion or exclusion rules. */
- String rules = "rules"; //$NON-NLS-1$
-
- /** rules - extension point to declare a validator group */
- String group = "validatorGroup"; //$NON-NLS-1$
-
- interface Group {
- /*
- * The group sub-element for either the validatorGroup or validator
- * extension points.
- */
- String elementGroup = "group"; //$NON-NLS-1$
- // a validator group identifier
- String attId = "id"; //$NON-NLS-1$
- // the listener sub-element
- String elementListener = "listener"; //$NON-NLS-1$
- // the group listener class name
- String attClass = "class"; //$NON-NLS-1$
- }
-
- /** Different types of rules for filtering validation. */
- interface Rule {
-
- /** projectNature - filter by project nature. */
- String projectNature = "projectNature"; //$NON-NLS-1$
-
- /** fileext - filter by file extension. */
- String fileext = "fileext"; //$NON-NLS-1$
-
- /** file - a file name, it can include path information as well. */
- String file = "file"; //$NON-NLS-1$
-
- /** facet - filter by facet id. */
- String facet = "facet"; //$NON-NLS-1$
-
- /** contentType - filter by content type. */
- String contentType = "contentType"; //$NON-NLS-1$
-
- /** pattern - filter paths by regular expression. */
- String pattern = "pattern"; //$NON-NLS-1$
- }
-
- /** Rule attributes */
- interface RuleAttrib {
-
- /** caseSensitive - true or false. */
- String caseSensitive = "caseSensitive"; //$NON-NLS-1$
-
- /**
- * exactMatch - true or false, default is true. It is used to decide whether content types need to match
- * exactly, or whether sub types should also be considered.
- */
- String exactMatch = "exactMatch"; //$NON-NLS-1$
-
- /** ext - a file extension, for example "html". */
- String ext = "ext"; //$NON-NLS-1$
-
- /** id - an identifier. */
- String id = "id"; //$NON-NLS-1$
-
- /** name - a file name. */
- String name = "name"; //$NON-NLS-1$
-
- /** regex - a Java regular expression. */
- String regex = "regex"; //$NON-NLS-1$
-
- /**
- * type - the type of file to be matched:
- * <ul>
- * <li>folder - project relative folder name
- * <li>file - simple file name
- * <li>full - fully qualified, project relative file name
- * </ul>
- */
- String fileType = "type"; //$NON-NLS-1$
-
- /** version - facet version expression. See the facet framework for the exact syntax of this expression. */
- String version = "version"; //$NON-NLS-1$
- }
-
- interface FileType {
- /** folder - project relative folder name */
- String folder = "folder"; //$NON-NLS-1$
-
- /** file - simple file name */
- String file = "file"; //$NON-NLS-1$
-
- /** full - fully qualified, project relative file name */
- String full = "full"; //$NON-NLS-1$
- }
-
- interface MessageCategory {
- /** messageCategory - name of the message category element. */
- String name = "messageCategory"; //$NON-NLS-1$
-
- /** id - simple id of the message. */
- String id = "id"; //$NON-NLS-1$
-
- /** label = human readable label of the message category. */
- String label = "label"; //$NON-NLS-1$
-
- /** severity - message severity, it must be one of error, warning or ignore. */
- String severity = "severity"; //$NON-NLS-1$
-
- String sevError = "error"; //$NON-NLS-1$
- String sevWarning = "warning"; //$NON-NLS-1$
- String sevIgnore = "ignore"; //$NON-NLS-1$
- }
-
- interface Exclude {
- /** id - fully qualified id of the validator that is being extended. */
- String id = "id"; //$NON-NLS-1$
- }
-
- /** true */
- String True = "true"; //$NON-NLS-1$
-
- /** false */
- String False = "false"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
deleted file mode 100644
index 090f4af..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
+++ /dev/null
@@ -1,110 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * The validators that have been defined by the validator extension points.
- * @author karasiuk
- *
- */
-public final class ExtensionValidators {
- private static ExtensionValidators _me;
-
- /** All the registered validators. The key is the validator id and the value is the validator. */
- private final Map<String, Validator> _map;
-
- public synchronized static ExtensionValidators instance(){
- if (_me == null){
- _me = new ExtensionValidators();
- }
- return _me;
- }
-
- private ExtensionValidators(){
- _map = new HashMap<String, Validator>(100);
- for (Validator v : ValidatorExtensionReader.getDefault().process()){
- _map.put(v.getId(), v);
- }
- }
-
- /**
- * Answer all the v2 validators that have been defined by the extension point. This is the real
- * map (not a copy).
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMapV2() {
- return _map;
- }
-
- /**
- * Answer all the v2 validators that have been defined by the extension point. This is a copy of
- * the map, but not a copy of the validators.
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMapV2Copy() {
- HashMap<String, Validator> map = new HashMap<String, Validator>(_map.size());
- map.putAll(_map);
- return map;
- }
-
-
- /**
- * Answer all the validators that have been defined by extension points. This includes all
- * the v2 validators, and all of the v1 validators that have been defined just on this project.
- *
- * @return The key is the validator id and the value is the validator.
- */
- public Map<String, Validator> getMap(IProject project) {
- //TODO I may want to consider caching this, but then again if the v1 validators are going away
- // it may not be worth it.
- Map<String, Validator> map = new HashMap<String, Validator>();
- map.putAll(_map);
-
- for (Validator v : getV1Validators(project))map.put(v.getId(), v);
-
- return map;
- }
-
- /**
- * Answer the v1 validators that have been defined just on this project.
- * @param project
- * @return
- */
- List<Validator> getV1Validators(IProject project){
- List<Validator> list = new LinkedList<Validator>();
- try {
- ProjectConfiguration pc = new ProjectConfiguration(project);
- pc.resetToDefault();
- for (ValidatorMetaData vmd : pc.getValidators()){
- Validator v = Validator.create(vmd, pc, project);
- list.add(v);
- }
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- return list;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
deleted file mode 100644
index 332a2c7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.wst.validation.internal.plugin.ValidationPlugin;
-
-public class FullBuildJob extends WorkspaceJob {
-
- public FullBuildJob(){
- super(ValMessages.JobName);
- }
-
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- try {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
- }
- catch (Exception e){
- return new Status(IStatus.ERROR,ValidationPlugin.PLUGIN_ID, e.toString(), e);
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
deleted file mode 100644
index 6788534..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A call back for listeners that are interested when a project changes.
- * @author karasiuk
- *
- */
-public interface IProjectChangeListener {
-
- int ProjectOpened = 1;
- int ProjectClosed = 2;
- int ProjectDeleted = 4;
-
- /** 8 - Something in the project description has changed. For example, a Nature was added. */
- int ProjectChanged = 8;
-
- /** 16 - The project has been added. */
- int ProjectAdded = 16;
-
- /**
- * The project has changed in some way.
- *
- * @param project The project that has changed.
- * @param type The type of change. This will be one of the Project constants;
- */
- void projectChanged(IProject project, int type);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
deleted file mode 100644
index a2d26d8..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
+++ /dev/null
@@ -1,31 +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.internal;
-
-/**
- * A class that wants to be notified when the validator preferences change.
- * @author karasiuk
- *
- */
-public interface IValChangedListener {
-
- /**
- * The validators for the project have changed.
- *
- * @param project the project can be null, which means that the global validation preferences have
- * changed.
- *
- * @param configSettingChanged If true a setting that could effect what gets validated has changed.
- * If false, then only other types of settings (like whether to show a results dialog or not) have
- * changed.
- */
- public void validatorsForProjectChanged(org.eclipse.core.resources.IProject project, boolean configSettingChanged);
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
deleted file mode 100644
index 8776525..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
+++ /dev/null
@@ -1,205 +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.internal;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * A central place to manage all of the V2 validation markers.
- * @author karasiuk
- *
- */
-public class MarkerManager {
-
- private Set<String> _markers = new HashSet<String>(50);
-
- public static MarkerManager getDefault(){
- return Singleton.markerManager;
- }
-
- private MarkerManager(){
- _markers.add(ValConstants.ProblemMarker);
- _markers.add(ConfigurationConstants.VALIDATION_MARKER);
- }
-
- /**
- * Clear any validation markers that may have been set by this validator.
- *
- * @param resource
- * The resource that may have it's markers cleared. It can be
- * null, in which case the operation is a no-op.
- * @param validator
- * The validator that created the marker.
- */
- public void clearMarker(IResource resource, Validator validator) throws CoreException {
- if (resource == null)return;
- hook(resource);
-
- String id = validator.getMarkerId();
- if (id != null){
- try {
- resource.deleteMarkers(id, true, IResource.DEPTH_ZERO);
- }
- catch (CoreException e){
- // Nothing that we can do. This is not worth logging.
- }
- return;
- }
-
- IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, true, IResource.DEPTH_ZERO);
- String valId = validator.getId();
- for (IMarker marker : markers){
- id = marker.getAttribute(ValidatorMessage.ValidationId, null);
- if (valId.equals(id))marker.delete();
- }
- }
-
- @SuppressWarnings("unchecked")
- public void createMarker(ValidatorMessage m, String id){
- try {
- IResource resource = m.getResource();
- hook(resource);
- IMarker marker = resource.createMarker(m.getType());
- Map map = m.getAttributes();
- if (map.get(ValidatorMessage.ValidationId) == null)
- map.put(ValidatorMessage.ValidationId, id);
- marker.setAttributes(map);
- }
- catch (CoreException e){
- if (!m.getResource().exists())throw new ResourceUnavailableError(m.getResource());
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- }
-
- /**
- * Delete all the markers on this resource that were created before the
- * operation start time.
- *
- * @param resource
- * The resource that is having it's markers deleted.
- * @param operationStartTime
- * The time as returned by System.currentTimeMillis().
- * @param depth
- * The depth of the markers to clear. It is one of the
- * IResource.DEPTH_XXX constants.
- */
- public void deleteMarkers(IResource resource, long operationStartTime, int depth){
- try {
- hook(resource);
- IMarker[] markers = resource.findMarkers(null, true, depth);
- String markerType;
- for (IMarker marker : markers){
- try {
- markerType = marker.getType();
- }
- catch (CoreException e)
- {
- //ignore the marker
- return;
- }
- if (_markers.contains(markerType)){
- long createTime = marker.getCreationTime();
- if (createTime < operationStartTime){
- try {
- marker.delete();
- }
- catch (CoreException e){
- // eat it - there is nothing we can do about this.
- }
- }
- }
- }
- }
- catch (CoreException e){
- IProject project = resource.getProject();
- if (!project.exists() || !project.isOpen())throw new ProjectUnavailableError(project);
- if (!resource.exists())throw new ResourceUnavailableError(resource);
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public void makeMarkers(List<IMessage> list){
- for (IMessage message : list){
- IResource res = null;
- Object target = message.getTargetObject();
- if (target != null && target instanceof IResource)res = (IResource)target;
- if (res == null){
- target = message.getAttribute(IMessage.TargetResource);
- if (target != null && target instanceof IResource)res = (IResource)target;
- }
- if (res != null){
- try {
- hook(res);
- String id = message.getMarkerId();
- if (id == null)id = ConfigurationConstants.VALIDATION_MARKER;
- IMarker marker = res.createMarker(id);
- marker.setAttributes(message.getAttributes());
- marker.setAttribute(IMarker.MESSAGE, message.getText());
- int markerSeverity = IMarker.SEVERITY_INFO;
- int sev = message.getSeverity();
- if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
- else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
- marker.setAttribute(IMarker.SEVERITY, markerSeverity);
- marker.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
-
- /**
- * A debugging method. A place to put break points, so that you can figure out what sort of marker
- * changes are happening.
- *
- * @param resource
- */
- public void hook(IResource resource){
-// String name = "first.test2x";
-// if (resource.getName().equals(name)){
-// String markers = Misc.listMarkers(resource);
-// Tracing.log("MarkerManager has hooked: ", name); //$NON-NLS-1$
-// RuntimeException rt = new RuntimeException("hooking " + name);
-// rt.printStackTrace();
-// }
- }
-
- public Set<String> getMarkers() {
- return _markers;
- }
-
- /**
- * Store the singleton for the MarkerManager. This approach is used to avoid having to synchronize the
- * MarkerManager.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private static class Singleton {
- static MarkerManager markerManager = new MarkerManager();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
deleted file mode 100644
index ceafc41..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
+++ /dev/null
@@ -1,155 +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.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Some miscellaneous helper methods.
- * @author karasiuk
- *
- */
-public final class Misc {
-
- public static void close(InputStream in){
- if (in == null)return;
- try {
- in.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static void close(OutputStream out) {
- if (out == null)return;
- try {
- out.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static boolean debugOptionAsBoolean(String option){
- String opt = Platform.getDebugOption(option);
- if (opt == null)return false;
- opt = opt.toLowerCase();
- if ("true".equals(opt))return true; //$NON-NLS-1$
- if ("yes".equals(opt))return true; //$NON-NLS-1$
- return false;
- }
-
-
- /**
- * Answer a units appropriate string for the time.
- * @param time time in nano seconds
- */
- public static String getTimeNano(long time){
- if (time <= 1000)return NLS.bind(ValMessages.TimeNano, time);
- if (time <= 1000000)return NLS.bind(ValMessages.TimeMicro, time/1000);
- return getTimeMS(time/1000000);
- }
-
- /**
- * Answer the CPU time consumed by this thread in nano seconds.
- * @return -1 if the time can not be determined.
- */
- public static long getCPUTime(){
- long cpuTime = -1;
- ThreadMXBean tb = ManagementFactory.getThreadMXBean();
- if (tb.isCurrentThreadCpuTimeSupported()){
- cpuTime = tb.getCurrentThreadCpuTime();
- }
- return cpuTime;
- }
-
- /**
- * Answer a units appropriate string for the time.
- * @param time time in milliseconds
- */
- public static String getTimeMS(long time) {
- if (time <= 1000)return ValMessages.TimeUnder;
- if (time <= 60000)return NLS.bind(ValMessages.TimeSec, time/1000);
- return NLS.bind(ValMessages.TimeMin, time/60000);
- }
-
- /**
- * Used in debugging so we can see what types of markers there are.
- * @param resource
- */
- public static String listMarkers(IResource resource){
- StringBuffer b = new StringBuffer(2000);
- try {
- IMarker[] markers = resource.findMarkers(null, true, IResource.DEPTH_ZERO);
- for (IMarker m : markers){
- Object o = m.getAttribute(IMarker.MESSAGE);
- if (o != null){
- b.append(o);
- }
- o = m.getAttribute(IMarker.SEVERITY);
- if (o != null){
- b.append(", Severity="); //$NON-NLS-1$
- b.append(o);
- }
- b.append("; "); //$NON-NLS-1$
- }
- }
- catch (CoreException e){
-
- }
- return b.toString();
- }
-
- /**
- * Answer true if they are the same. If they are both null then they are the same.
- * @param s1 the string to compare. It can be null.
- * @param s2 the string to compare. It can be null.
- */
- public static boolean same(String s1, String s2){
- if (s1 == null && s2 == null)return true;
- if (s1 == null)return false;
- return s1.equals(s2);
- }
-
- public static void niy(String msg){
- if (msg == null)msg = "Sorry, this function is not implemented yet"; //$NON-NLS-1$
- throw new RuntimeException(msg);
- }
-
- /**
- * Answer the type as a human readable string. This is only used for debugging.
- * @param type
- * @return
- */
- public static String resourceChangeEventType(int type){
- StringBuffer b = new StringBuffer(200);
- if ((type & IResourceChangeEvent.POST_BUILD) != 0)b.append("post_build "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.POST_CHANGE) != 0)b.append("post_change "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_BUILD) != 0)b.append("pre_build "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_CLOSE) != 0)b.append("pre_close "); //$NON-NLS-1$
- if ((type & IResourceChangeEvent.PRE_DELETE) != 0)b.append("pre_delete "); //$NON-NLS-1$
- return b.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
deleted file mode 100644
index 9f057aa..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A null validator that is used in error cases. It simply no-ops.
- * @author karasiuk
- *
- */
-public class NullValidator extends AbstractValidator {
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
deleted file mode 100644
index f00e93d..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
+++ /dev/null
@@ -1,192 +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.internal;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class PerformanceMonitor implements IPerformanceMonitor {
-
- private CollectionLevel _level = CollectionLevel.None;
- private boolean _summaryOnly;
-
- /**
- * Create a performance monitor.
- *
- * @param traceTimes
- * Should the monitor be turned on?
- * @param file
- * Should the events be logged to a file. If this is null or the
- * empty string the events will be written to stderr. Otherwise
- * the events are appended to a file with this name.
- *
- * @param logInSeconds
- * Set this to true if you want the times that are logged in the
- * trace file normalized to seconds. Otherwise the default units are used,
- * milliseconds for elapsed time and nanoseconds for cpu time.
- */
- public static PerformanceMonitor create(boolean traceTimes, String file, boolean logInSeconds){
- PerformanceMonitor pm = null;
- if (file == null || file.length() == 0)pm = new PerformanceMonitor();
- else pm = new ToFile(file, logInSeconds);
-
- if (traceTimes)pm.setCollectionLevel(CollectionLevel.Default);
-
- return pm;
- }
-
- private PerformanceMonitor(){};
-
- public CollectionLevel getCollectionLevel() {
- return _level;
- }
-
- public void setCollectionLevel(CollectionLevel level) {
- _level = level;
- }
-
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
- return new LinkedList<PerformanceCounters>();
- }
-
-
- public void resetPerformanceCounters() {
- }
-
- public boolean isCollecting() {
- return _level != CollectionLevel.None;
- }
-
- public boolean isSummaryOnly() {
- return _summaryOnly;
- }
-
- public void add(PerformanceCounters counters){
- Tracing.write(counters.toString());
- }
-
- public static class Counters{
- String name;
- int numberInvocations;
-
- /** Elapsed time in milliseconds. */
- long elapsedTime;
-
- /** CPU time in nanoseconds, or -1 if unknown. */
- long cpuTime;
- }
-
- public static class ToFile extends PerformanceMonitor {
-
- private String _fileName;
- private boolean _logInSeconds;
-
- private PrintWriter _pw;
- private static final String Comma=","; //$NON-NLS-1$
- private static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
-
- private ToFile(String fileName, boolean logInSeconds){
- _fileName = fileName;
- _logInSeconds = logInSeconds;
- }
-
- @Override
- public synchronized void add(PerformanceCounters pc) {
- try {
- PrintWriter pw = getWriter();
- pw.print(_df.format(pc.getWhen()) + Comma +
- pc.getValidatorId() + Comma + pc.getNumberInvocations() + Comma);
- if (_logInSeconds){
- double sec = ((double)pc.getElapsedTime()) / 1000.0;
- pw.print(sec);
- pw.print(Comma);
- sec = ((double)pc.getCpuTime()) / 1000000000.0;
- pw.print(sec);
- }
- else {
- pw.print(pc.getElapsedTime()+Comma+pc.getCpuTime());
- }
- pw.println(Comma + pc.getResourceName());
- pw.flush();
- }
- catch (IOException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- private PrintWriter getWriter() throws IOException {
- if (_pw == null){
- _pw = new PrintWriter(new FileOutputStream(_fileName, true));
- DateFormat df = DateFormat.getDateTimeInstance();
- _pw.println("# " + NLS.bind(ValMessages.LogSession, //$NON-NLS-1$
- df.format(new Date(System.currentTimeMillis()))));
- if (_logInSeconds)
- _pw.println("# when, id, invocation count, elapsed time (seconds), cpu time (seconds), resource"); //$NON-NLS-1$
- else
- _pw.println("# when, id, invocation count, elapsed time (ms), cpu time (ns), resource"); //$NON-NLS-1$
- }
- return _pw;
-
- }
- }
-
- public static class Collecting extends PerformanceMonitor {
- private List<PerformanceCounters> _counters = new LinkedList<PerformanceCounters>();
-
- public void add(PerformanceCounters counters){
- _counters.add(counters);
- }
-
- public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
- if (asSummary){
- Map<String, Counters> map = new HashMap<String, Counters>(40);
- for (PerformanceCounters pc : _counters){
- Counters c = map.get(pc.getValidatorId());
- if (c == null){
- c = new Counters();
- c.name = pc.getValidatorName();
- map.put(pc.getValidatorId(), c);
- }
- c.numberInvocations += pc.getNumberInvocations();
- c.elapsedTime += pc.getElapsedTime();
- if (pc.getCpuTime() != -1)c.cpuTime += pc.getCpuTime();
- else c.cpuTime = -1;
- }
- List<PerformanceCounters> list = new LinkedList<PerformanceCounters>();
- for (Map.Entry<String, Counters> me : map.entrySet()){
- Counters c = me.getValue();
- list.add(new PerformanceCounters(me.getKey(), c.name, null, c.numberInvocations, c.elapsedTime, c.cpuTime));
- }
- return list;
- }
- return _counters;
- }
-
- public void resetPerformanceCounters() {
- _counters.clear();
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
deleted file mode 100644
index 3bac075..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
+++ /dev/null
@@ -1,116 +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.internal;
-
-/**
- * The constants that are used in the preference store so save the validator configurations.
- * <p>
- * The entries in the preference hierarchy are organized something like this:
- * <pre>
- * /instance/frame-work-id/saveAuto=true|false
- * /instance/frame-work-id/suspend=true|false
- * /instance/frame-work-id/vf.version=2
- * /instance/frame-work-id/filters/val-id/build=true|false
- * /instance/frame-work-id/filters/val-id/manual=true|false
- * /instance/frame-work-id/filters/val-id/version=someNumber
- * /instance/frame-work-id/filters/val-id/groups/0/type=include|exclude
- * /instance/frame-work-id/filters/val-id/groups/0/rules/0/type=file|fileext|projectNature|...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/0/pattern=...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/1/type=file|fileext|projectNature|...
- * /instance/frame-work-id/filters/val-id/groups/0/rules/1/pattern=...
- * </pre>
- * <p>
- * New approach
- * <pre>
- * vals/val-id/global=TF[version][len]delegate-id
- * vals/val-id/groups=[groups]
- * </pre>
- *
- *
- * @author karasiuk
- *
- */
-public interface PrefConstants {
-
- /** filters - node where all the filters are saved. */
- String filters = "filters"; //$NON-NLS-1$
-
- /** build - is the validator enabled for builds? */
- String build = "build"; //$NON-NLS-1$
-
- /** delegate - the delegating implementation to use */
- String delegate = "delegate"; //$NON-NLS-1$
-
- /** disabled - the list of disabled resources in the project. */
- String disabled = "disabled"; //$NON-NLS-1$
-
- /** exactMatch - must the content type match exactly? */
- String exactMatch = "exactMatch"; //$NON-NLS-1$
-
- /** manual - is the validator enabled for manual validation? */
- String manual = "manual"; //$NON-NLS-1$
-
- /** msgs - node where all the message severity mappings are stored. */
- String msgs = "msgs"; //$NON-NLS-1$
-
- /**
- * version - version of the filter definition. This is something that a client can use to keep track
- * of changes that they might make to their validation extension.
- */
- String version = "version"; //$NON-NLS-1$
-
- /** vf.version - version of the validation framework. */
- String frameworkVersion = "vf.version"; //$NON-NLS-1$
-
- /** groups - filter group. */
- String groups = "groups"; //$NON-NLS-1$
-
- /** type - type of group, either include or exclude. */
- String type = "type"; //$NON-NLS-1$
-
- /** type - the type of rule. */
- String ruleType = "type"; //$NON-NLS-1$
-
- /** rules - a filter rule. */
- String rules = "rules"; //$NON-NLS-1$
-
- /** pattern - the pattern part of the rule. */
- String pattern = "pattern"; //$NON-NLS-1$
-
- /** saveAuto - can we save all the resources automatically? true/false */
- String saveAuto = "saveAuto"; //$NON-NLS-1$
-
- /** stateTS - plug-in state time stamp */
- String stateTS = "stateTS"; //$NON-NLS-1$
-
- /** suspend - suspend all validation? true/false */
- String suspend = "suspend"; //$NON-NLS-1$
-
- /** case - is this case sensitive? */
- String caseSensitive = "case"; //$NON-NLS-1$
-
- /** fileType - the type of file, see FilterRule.File */
- String fileType = "fileType"; //$NON-NLS-1$
-
- /** confirmDialog - should we show a confirmation dialog when doing a manual validation? */
- String confirmDialog = "confirmDialog"; //$NON-NLS-1$
-
- /** override - should we show projects to override the global preferences? */
- String override = "override"; //$NON-NLS-1$
-
- /** vals - the validators are grouped under this node. */
- String vals = "vals"; //$NON-NLS-1$
-
- /** global - some global validation settings. */
- String global = "global"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java
deleted file mode 100644
index 0f3a5e7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The subset of the IEclipsePreferences interface that the framework needs to
- * be able to persist preferences.
- * @author karasiuk
- *
- */
-public abstract class PreferencesWrapper {
-
- private static final WrapperManger _manager = new WrapperManger();
-
- /**
- * Answer the preferences for the project. If project is null answer the global preferences.
- * @param project
- * @param persistent if null the default preferences are returned, if True the persisted
- * preferences are return and if False the transient preferences are returned.
- * @return
- */
- public static PreferencesWrapper getPreferences(IProject project, Boolean persistent){
- return _manager.get(project, persistent);
- }
-
- /**
- * These are the names of the node entries.
- * @return
- * @throws BackingStoreException
- */
- public abstract String[] childrenNames() throws BackingStoreException;
-
- public void flush() throws BackingStoreException {
- }
-
- public abstract boolean getBoolean(String key, boolean def);
-
- public abstract String get(String key, String def);
-
- public abstract int getInt(String key, int def);
-
- public abstract long getLong(String key, long def);
-
- public abstract String[] keys() throws BackingStoreException;
-
- public boolean isPersistent(){
- return false;
- }
-
- public boolean isTransient(){
- return false;
- }
-
- public abstract void put(String key, String value);
-
- public abstract void putBoolean(String key, boolean value);
-
- public abstract void putLong(String key, long value);
-
- public abstract void putInt(String key, int value);
-
- /**
- * Unlike the more sophisticated org.osgi.service.prefs.Preferences support,
- * this is currently limited to simple node names.
- */
- public abstract PreferencesWrapper node(String nodeName);
-
- public abstract boolean nodeExists();
-
- public abstract boolean nodeExists(String pathName) throws BackingStoreException;
-
- public abstract void removeNode() throws BackingStoreException;
-
-
-public final static class PreferencesWrapperPersistent extends PreferencesWrapper {
-
- private final Preferences _preferences;
-
- public PreferencesWrapperPersistent(Preferences preferences){
- _preferences = preferences;
- }
-
- @Override
- public String[] childrenNames() throws BackingStoreException {
- return _preferences.childrenNames();
- }
-
- public void flush() throws BackingStoreException {
- _preferences.flush();
- }
-
- @Override
- public String get(String key, String def) {
- return _preferences.get(key, def);
- }
-
- @Override
- public boolean getBoolean(String key, boolean def) {
- return _preferences.getBoolean(key, def);
- }
-
- @Override
- public int getInt(String key, int def) {
- return _preferences.getInt(key, def);
- }
-
- @Override
- public long getLong(String key, long def) {
- return _preferences.getLong(key, def);
- }
-
- @Override
- public String[] keys() throws BackingStoreException {
- return _preferences.keys();
- }
-
- @Override
- public boolean isPersistent() {
- return true;
- }
-
- @Override
- public void put(String key, String value) {
- _preferences.put(key, value);
- }
-
- @Override
- public PreferencesWrapper node(String path) {
- Preferences prefs = _preferences.node(path);
- return new PreferencesWrapperPersistent(prefs);
- }
-
- @Override
- public boolean nodeExists() {
- try {
- return nodeExists(""); //$NON-NLS-1$
- }
- catch (BackingStoreException e){
-
- }
- return false;
- }
-
- @Override
- public boolean nodeExists(String pathName) throws BackingStoreException {
- return _preferences.nodeExists(pathName);
- }
-
- public void putBoolean(String key, boolean value) {
- _preferences.putBoolean(key, value);
- }
-
- public void putLong(String key, long value){
- _preferences.putLong(key, value);
- }
-
- @Override
- public void putInt(String key, int value) {
- _preferences.putInt(key, value);
- }
-
- @Override
- public void removeNode() throws BackingStoreException {
- _preferences.removeNode();
- }
-}
-
-public final static class PreferencesWrapperTransient extends PreferencesWrapper {
-
- private final PreferencesWrapperTransient _parent;
- private final Map<String, String> _children = Collections.synchronizedMap(new HashMap<String, String>(10));
- private final Map<String, PreferencesWrapperTransient> _nodes = Collections.synchronizedMap(new HashMap<String, PreferencesWrapperTransient>(10));
-
- public PreferencesWrapperTransient(PreferencesWrapperTransient parent){
- _parent = parent;
- }
-
- public PreferencesWrapperTransient(PreferencesWrapper pw, PreferencesWrapperTransient parent) {
- _parent = parent;
- try {
- for (String key : pw.keys()){
- put(key, pw.get(key, null));
- }
-
-
- for (String nodeName : pw.childrenNames()){
- PreferencesWrapper p = pw.node(nodeName);
- PreferencesWrapperTransient pwt = new PreferencesWrapperTransient(p, this);
- _nodes.put(nodeName, pwt);
- }
- }
- catch (BackingStoreException e){
-
- }
- }
-
- @Override
- public String[] childrenNames() throws BackingStoreException {
- Set<String> keys = _nodes.keySet();
- String names[] = new String[keys.size()];
- keys.toArray(names);
- return names;
- }
-
- @Override
- public String get(String key, String def) {
- String value = _children.get(key);
- if (value != null)return value;
- return def;
- }
-
- @Override
- public boolean getBoolean(String key, boolean def) {
- String value = _children.get(key);
- if (value == null)return def;
- value = value.toLowerCase();
- if ("true".equals(value))return true; //$NON-NLS-1$
- if ("false".equals(value))return false; //$NON-NLS-1$
- return def;
- }
-
- @Override
- public int getInt(String key, int def) {
- String value = _children.get(key);
- if (value == null)return def;
- try {
- return Integer.parseInt(value);
- }
- catch (NumberFormatException e){
- }
- return def;
- }
-
- @Override
- public long getLong(String key, long def) {
- String value = _children.get(key);
- if (value == null)return def;
- try {
- return Long.parseLong(value);
- }
- catch (NumberFormatException e){
- }
- return def;
- }
-
- @Override
- public boolean isTransient() {
- return true;
- }
-
- @Override
- public synchronized String[] keys() throws BackingStoreException {
- String[] keys = new String[_children.size()];
- _children.keySet().toArray(keys);
- return keys;
- }
-
- @Override
- public synchronized PreferencesWrapper node(String name) {
- PreferencesWrapperTransient pw = _nodes.get(name);
- if (pw != null)return pw;
- pw = new PreferencesWrapperTransient(this);
- _nodes.put(name, pw);
- return pw;
- }
-
- @Override
- public boolean nodeExists() {
- return true;
- }
-
- @Override
- public boolean nodeExists(String key) throws BackingStoreException {
- PreferencesWrapperTransient pw = _nodes.get(key);
- if (pw != null)return true;
- return false;
- }
-
- @Override
- public void put(String key, String value) {
- _children.put(key, value);
- }
-
- @Override
- public void putBoolean(String key, boolean bool) {
- String value = bool ? "true" : "false"; //$NON-NLS-1$//$NON-NLS-2$
- _children.put(key, value);
- }
-
- @Override
- public void putInt(String key, int value) {
- _children.put(key, String.valueOf(value));
- }
-
- @Override
- public void putLong(String key, long value) {
- _children.put(key, String.valueOf(value));
- }
-
- @Override
- public void removeNode() throws BackingStoreException {
- if (_parent == null)return;
- _parent.removeNode(this);
- }
-
- private synchronized void removeNode(PreferencesWrapperTransient node){
- String key = null;
- for (Map.Entry<String, PreferencesWrapperTransient> me : _nodes.entrySet()){
- if (me.getValue().equals(node)){
- key = me.getKey();
- break;
- }
- }
- if (key != null)_nodes.remove(key);
- }
-}
-
-private final static class WrapperManger implements IProjectChangeListener {
-
- private final Map<IProject, PreferencesWrapper> _map = new HashMap<IProject, PreferencesWrapper>(20);
- private final AtomicReference<PreferencesWrapper> _global = new AtomicReference<PreferencesWrapper>();
-
- private WrapperManger(){
- EventManager.getManager().addProjectChangeListener(this);
- }
-
- /**
- * Currently this object never goes away, but if that was ever to change then we would need to dispose it.
- */
- @Override
- protected void finalize() throws Throwable {
- dispose();
- }
-
- public void dispose(){
- EventManager.getManager().removeProjectChangeListener(this);
- }
-
- public PreferencesWrapper get(IProject project, Boolean persistent) {
- if (project == null)return globalPreferences(persistent);
- PreferencesWrapper pw = null;
- synchronized(_map){
- pw = _map.get(project);
- }
-
- if (pw != null && (persistent == null || persistent == pw.isPersistent()))return pw;
-
- if (pw == null)pw = new PreferencesWrapperPersistent(ValidationPlugin.getPreferences(project));
- if (persistent != null && persistent && pw.isTransient())pw = new PreferencesWrapperPersistent(ValidationPlugin.getPreferences(project));
- if (persistent != null && !persistent && pw.isPersistent())pw = new PreferencesWrapperTransient(pw, null);
-
- synchronized(_map){
- _map.put(project, pw);
- }
-
- return pw;
- }
-
- /**
- * Answer the appropriate global preferences.
- *
- * @param persistent
- * If null then answer the current saved global preferences,
- * creating a new persistent one if there is none. If True,
- * then ensure that the preferences are persistent. If False,
- * ensure that the preferences are transient.
- * @return
- */
- private PreferencesWrapper globalPreferences(Boolean persistent) {
- PreferencesWrapper pw = _global.get();
-
- while(pw == null){
- PreferencesWrapper newPW = createGlobal(persistent);
- if (_global.compareAndSet(null, newPW))pw = newPW;
- else pw = _global.get();
- }
-
- while (persistent != null && !persistent && !pw.isTransient()){
- PreferencesWrapper newPW = new PreferencesWrapperTransient(pw, null);
- if (_global.compareAndSet(pw, newPW))pw = newPW;
- else pw = _global.get();
- }
-
- while (persistent != null && persistent && !pw.isPersistent()){
- PreferencesWrapper newPW = new PreferencesWrapperPersistent(ValidationFramework.getDefault().getPreferenceStore());
- if (_global.compareAndSet(pw, newPW))pw = newPW;
- else pw = _global.get();
- }
- return pw;
- }
-
- private PreferencesWrapper createGlobal(Boolean persistent){
- PreferencesWrapper pw = new PreferencesWrapperPersistent(ValidationFramework.getDefault().getPreferenceStore());
- if (persistent == null || persistent)return pw;
- return new PreferencesWrapperTransient(pw, null);
- }
-
- public void projectChanged(IProject project, int type) {
- int interested = IProjectChangeListener.ProjectClosed | IProjectChangeListener.ProjectDeleted;
- if ((type & interested) != 0){
- synchronized (_map) {
- _map.remove(project);
- }
- }
-
- }
-
-}
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
deleted file mode 100644
index 03e2b65..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * This internal error is used to signal that a project is now unavailable.
- * <p>
- * We could be in the middle of validating a large project, and the project could be closed.
- * This error is used to "exit" the validation framework.
- * <p>
- * This is an error rather than a runtime exception, because some parts of Eclipse like to
- * trap RuntimeExceptions and log them.
- * @author karasiuk
- *
- */
-public class ProjectUnavailableError extends Error {
-
- private IProject _project;
-
- private static final long serialVersionUID = 200801281118L;
-
- public ProjectUnavailableError(IProject project){
- super();
- _project = project;
- }
-
- public IProject getProject() {
- return _project;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
deleted file mode 100644
index 9543670..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This internal error is used to signal that a resource is now unavailable.
- * <p>
- * This error is used to "exit" the validation framework.
- * <p>
- * This is an error rather than a runtime exception, because some parts of Eclipse like to
- * trap RuntimeExceptions and log them.
- * @author karasiuk
- *
- */
-public class ResourceUnavailableError extends Error {
-
- private static final long serialVersionUID = 200801290853L;
-
- private IResource _resource;
-
- public ResourceUnavailableError(IResource resource){
- super();
- _resource = resource;
- }
-
- public IResource getResource() {
- return _resource;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
deleted file mode 100644
index 22da768..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * A simple encoder that knows how to convert booleans, integers and strings, into a single string.
- *
- * @see Deserializer
- * @author karasiuk
- *
- */
-public class Serializer {
- private StringBuffer _buffer;
-
- public Serializer(int size){
- _buffer = new StringBuffer(size);
- }
-
- public void put(boolean bool){
- _buffer.append(bool ? 'T' : 'F');
- }
-
- public void put(String string){
- put(string.length());
- _buffer.append(string);
- }
-
- public void put(int anInt){
- String s = String.valueOf(anInt);
- int len = s.length();
- _buffer.append(len-1);
- _buffer.append(s);
- }
-
- @Override
- public String toString() {
- return _buffer.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
deleted file mode 100644
index 5a19332..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
+++ /dev/null
@@ -1,63 +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;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * This class extends the workbench reporter by capturing some summary information about any added
- * messages.
- * @author karasiuk
- *
- */
-public class SummaryReporter extends WorkbenchReporter {
-
- private int _severityHigh;
- private int _severityNormal;
- private int _severityLow;
-
- public SummaryReporter(IProject project, IProgressMonitor monitor) {
- super(project, monitor);
- }
-
- @Override
- public void addMessage(IValidator validator, IMessage message) {
- super.addMessage(validator, message);
- switch (message.getSeverity()){
- case IMessage.HIGH_SEVERITY:
- _severityHigh++;
- break;
- case IMessage.NORMAL_SEVERITY:
- _severityNormal++;
- break;
- case IMessage.LOW_SEVERITY:
- _severityLow++;
- break;
- }
- }
-
- public int getSeverityHigh() {
- return _severityHigh;
- }
-
- public int getSeverityNormal() {
- return _severityNormal;
- }
-
- public int getSeverityLow() {
- return _severityLow;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
deleted file mode 100644
index 77e49cb..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
+++ /dev/null
@@ -1,208 +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.internal;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Control the tracing that this plug-in performs. This is used for service.
- * @author karasiuk
- *
- */
-public final class Tracing {
-
- private final static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
- private final static boolean _isLogging = ValidationPlugin.getPlugin().isDebugging();
- private final static boolean _traceMatches = Misc.debugOptionAsBoolean(DebugConstants.TraceMatches);
- private final static boolean _traceV1 = Misc.debugOptionAsBoolean(DebugConstants.TraceV1);
- private final static String _extraValDetail = Platform.getDebugOption(DebugConstants.ExtraValDetail);
- private final static int _tracingLevel;
-
- private final static String _filter = Platform.getDebugOption(DebugConstants.FilterAllExcept);
-
- static {
- String traceLevel = Platform.getDebugOption(DebugConstants.TraceLevel);
- int level = 0;
- if (traceLevel != null){
- try {
- level = Integer.parseInt(traceLevel);
- }
- catch (Exception e){
- }
- }
- _tracingLevel = level;
- }
-
- /**
- * Answer true if the filters allow this validator to be enabled. Normally this method will answer true.
- * It is only when filters are activated via the debugging options, that this method might return false.
- * This is used to aid in debugging by making it look like only one validator has been registered.
- *
- * @param validatorId the validator id.
- * @return true if the validator should be registered via an extension point.
- */
- public static boolean isEnabled(String validatorId){
- if (_filter == null || _filter.length() == 0)return true;
- return (_filter.equals(validatorId));
- }
-
- /**
- * Are we in logging/debugging mode?
- */
- public static boolean isLogging(){
- return _isLogging;
- }
-
- /**
- * Answer true if we are in logging mode, and if the current logging level is greater than or
- * equal to level.
- * @param level The logging level that we are testing. The higher the level the more verbose
- * the tracing.
- */
- public static boolean isLogging(int level){
- if (_isLogging){
- return _tracingLevel >= level;
- }
- return false;
- }
-
- public static boolean isTraceMatches(){
- return _traceMatches;
- }
-
- public static boolean isTraceV1(){
- return _traceV1;
- }
-
- public static boolean matchesExtraDetail(String validatorId){
- if (_extraValDetail == null)return false;
- return _extraValDetail.equals(validatorId);
- }
-
- /**
- * Write a line to the console for debugging, if in debugging mode.
- * @param line
- */
- public static void log(String line){
- if (isLogging())write(line);
- }
-
- public static void log(Object... parts){
- if (isLogging()){
- StringBuffer b = new StringBuffer(200);
- for (Object p : parts)b.append(p);
- write(b.toString());
- }
- }
-
- /**
- * Write a line to the log. Include a time stamp with the line.
- * @param line
- */
- public static void write(String line){
- System.err.println(timestampIt(line));
- }
-
- public static String timestampIt(String line){
- Date date = new Date();
- String thread = Thread.currentThread().getName();
- return _df.format(date) + " " + thread + " " + line; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- /**
- * If we are in logging mode, log the item, and then reset the string buffer.
- */
- public static void log(StringBuffer b){
- log(b.toString());
- b.setLength(0);
- }
-
- /**
- * This method doesn't do anything, and will be removed.
- *
- * @deprecated
- */
- public static void setForceLogging(boolean forceLogging) {
- }
-
- /**
- * Log up to maxNumber deltas to the log.
- * @param delta The deltas to log.
- * @param maxNumber The maximum number of deltas to log.
- */
- public static void logResourceDeltas(IResourceDelta delta, int maxNumber){
- if (!isLogging())return;
- if (delta == null)Tracing.log(" ResourceDelta: null"); //$NON-NLS-1$
- else {
- DeltaLogger logger = new DeltaLogger(maxNumber);
- try {
- delta.accept(logger);
- if (logger.getCount() == 0)Tracing.log(" ResourceDelta: no deltas"); //$NON-NLS-1$
- }
- catch (CoreException e){
- // eat it
- }
- }
- }
-
- /**
- * A debugging class that prints out some resource delta's.
- * @author karasiuk
- *
- */
- private final static class DeltaLogger implements IResourceDeltaVisitor {
-
- private final int _max;
- private int _count;
- public int getCount() {
- return _count;
- }
-
- private StringBuffer _b = new StringBuffer(200);
-
- public DeltaLogger(int max){
- _max = max;
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- if (_count++ > _max)return false;
- int kind = delta.getKind();
- String type = "unknown"; //$NON-NLS-1$
- switch (kind){
- case IResourceDelta.ADDED:
- type = "Added"; //$NON-NLS-1$
- break;
- case IResourceDelta.CHANGED:
- type = "Changed"; //$NON-NLS-1$
- break;
- case IResourceDelta.REMOVED:
- type = "Removed"; //$NON-NLS-1$
- break;
- }
- _b.append(" ResourceDelta "); //$NON-NLS-1$
- _b.append(type);
- _b.append(' ');
- _b.append(delta.getResource());
- Tracing.log(_b);
- return true;
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
deleted file mode 100644
index 5aafeee..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
+++ /dev/null
@@ -1,345 +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.internal;
-
-import java.util.LinkedList;
-import java.util.Queue;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.SubMonitor;
-import org.eclipse.wst.validation.DependentResource;
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.IDependencyIndex;
-import org.eclipse.wst.validation.ValidationEvent;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Run all the v2 validators through this job.
- * <p>
- * This is the main class for supporting build based validation. When triggered it looks at all of the
- * resource changes and determines what needs to be validated.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValBuilderJob extends WorkspaceJob {
-
- private static ValBuilderJob _job;
- private static Queue<ValidationRequest> _work = new LinkedList<ValidationRequest>();
-
- private final ValOperation _operation = new ValOperation();
-
- /** The types of changes we are interested in. */
- private final static int InterestedFlags = IResourceDelta.CONTENT | IResourceDelta.ENCODING |
- IResourceDelta.MOVED_FROM | IResourceDelta.MOVED_TO;
-
- public static synchronized void validateProject(IProject project, IResourceDelta delta, int buildKind){
- ValidationRequest request = new ValidationRequest(project, delta, buildKind);
- if (_job == null){
- _job = new ValBuilderJob();
- _job.add(request);
- _job.schedule();
- }
- else {
- _job.add(request);
- }
- }
-
- private static synchronized ValidationRequest getRequest(){
- ValidationRequest request = _work.poll();
- if (request == null){
- _job = null;
- }
- return request;
- }
-
- /**
- * Each validation run is done in it's own job.
- *
- * @param project the project that is being validated
- * @param delta the delta that is being validated. This may be null, in which case we do a
- * full validation of the project.
- *
- * @param buildKind the kind of build.
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#AUTO_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#CLEAN_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#FULL_BUILD
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#INCREMENTAL_BUILD
- *
- * @param operation some global context for the validation operation
- *
- */
- private ValBuilderJob(){
- super(ValMessages.JobName);
- }
-
- private void add(ValidationRequest request){
- _work.add(request);
- }
-
- @Override
- public boolean belongsTo(Object family) {
- if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
- if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
- return true;
- }
-
- return super.belongsTo(family);
- }
-
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor) {
- Tracing.log("ValBuilderJob-01: Starting"); //$NON-NLS-1$
-
- try {
- startingValidation(monitor);
-
- ValidationRequest request = getRequest();
- while(request != null){
- run(request, monitor);
- request = getRequest();
- }
- }
- finally {
- finishingValidation(monitor);
- }
-
- Tracing.log("ValBuilderJob-02: Finished"); //$NON-NLS-1$
- return Status.OK_STATUS;
- }
-
- private void startingValidation(IProgressMonitor monitor) {
- IValidatorVisitor startingVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationStarting(project, operation.getState(), monitor);
- }
- };
-
- ValManager.getDefault().accept(startingVisitor, null, ValType.Build, getOperation(), monitor);
- }
-
- private void finishingValidation(IProgressMonitor monitor) {
-
- IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
- };
- ValManager.getDefault().accept(finishedVisitor, null, ValType.Build, getOperation(), monitor);
- }
-
- private void run(ValidationRequest request, IProgressMonitor monitor){
- setName(ValMessages.JobName + " " + request.getProject().getName()); //$NON-NLS-1$
- try {
- IValidatorVisitor startingVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationStarting(project, operation.getState(), monitor);
- }
- };
-
- ValManager.getDefault().accept(startingVisitor, request.getProject(), ValType.Build, getOperation(), monitor);
-
- if (request.getDelta() == null)fullBuild(request, monitor);
- else deltaBuild(request, monitor);
-
-
- }
- catch (ProjectUnavailableError e){
- ValidationPlugin.getPlugin().handleProjectUnavailableError(e);
- }
- catch (ResourceUnavailableError e){
- ValidationPlugin.getPlugin().handleResourceUnavailableError(e);
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- finally {
- IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
- };
- ValManager.getDefault().accept(finishedVisitor, request.getProject(), ValType.Build, getOperation(), monitor);
- }
-
- }
-
- private void deltaBuild(ValidationRequest request, IProgressMonitor monitor) throws CoreException {
- ResourceCounter counter = new ResourceCounter();
- request.getDelta().accept(counter);
- SubMonitor subMonitor = SubMonitor.convert(monitor, counter.getCount());
- Visitor vistitor = new Visitor(request, subMonitor, monitor, getOperation());
- request.getDelta().accept(vistitor);
- }
-
- private void fullBuild(ValidationRequest request, IProgressMonitor monitor) throws CoreException {
- ResourceCounter counter = new ResourceCounter();
- request.getProject().accept(counter, 0);
- SubMonitor subMonitor = SubMonitor.convert(monitor, counter.getCount());
- Visitor vistitor = new Visitor(request, subMonitor, monitor, getOperation());
- request.getProject().accept(vistitor);
-
- }
-
- private ValOperation getOperation(){
- return _operation;
- }
-
- static final class ResourceCounter implements IResourceProxyVisitor, IResourceDeltaVisitor {
-
- private int _count;
-
- public int getCount() {
- return _count;
- }
-
- public boolean visit(IResourceProxy proxy) throws CoreException {
- _count++;
- return true;
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- _count++;
- return true;
- }
- }
-
- static final class ValidationRequest {
- /** The project that is being built. */
- private final IProject _project;
-
- /** The resource delta that triggered the build, it will be null for a full build. */
- private final IResourceDelta _delta;
-
- /**
- * The kind of build.
- *
- * @see org.eclipse.core.resources.IncrementalProjectBuilder
- */
- private final int _buildKind;
-
- public ValidationRequest(IProject project, IResourceDelta delta, int buildKind){
- _project = project;
- _delta = delta;
- _buildKind = buildKind;
- }
-
- public IProject getProject() {
- return _project;
- }
-
- public IResourceDelta getDelta() {
- return _delta;
- }
-
- public int getBuildKind() {
- return _buildKind;
- }
- }
-
- private final static class Visitor implements IResourceDeltaVisitor, IResourceVisitor{
-
- private final ValidationRequest _request;
- private final SubMonitor _subMonitor;
- private final IProgressMonitor _monitor;
- private final ValOperation _operation;
-
- public Visitor(ValidationRequest request, SubMonitor subMonitor, IProgressMonitor monitor, ValOperation operation){
- _request = request;
- _subMonitor = subMonitor;
- _monitor = monitor;
- _operation = operation;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- try {
- if (DisabledResourceManager.getDefault().isDisabled(resource)){
- MarkerManager.getDefault().deleteMarkers(resource, _operation.getStarted(), IResource.DEPTH_INFINITE);
- return false;
- }
- ValManager.getDefault().validate(_request.getProject(), resource, IResourceDelta.NO_CHANGE, ValType.Build,
- _request.getBuildKind(), _operation, _subMonitor.newChild(1));
- }
- catch (ResourceUnavailableError e){
- if (Tracing.isLogging())Tracing.log("ValBuilderJob-02: " + e.toString()); //$NON-NLS-1$
- return false;
- }
- return true;
- }
-
- @SuppressWarnings("deprecation")
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (DisabledResourceManager.getDefault().isDisabled(resource)){
- MarkerManager.getDefault().deleteMarkers(resource, _operation.getStarted(), IResource.DEPTH_INFINITE);
- return false;
- }
- int kind = delta.getKind();
- boolean isChanged = (kind & IResourceDelta.CHANGED) != 0;
- if (isChanged && (delta.getFlags() & InterestedFlags) == 0)return true;
-
- if ((kind & (IResourceDelta.ADDED | IResourceDelta.CHANGED)) != 0){
- ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build,
- _request.getBuildKind(), _operation, _subMonitor.newChild(1));
- }
-
- IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();
- if (index.isDependedOn(resource)){
- MarkerManager mm = MarkerManager.getDefault();
- for (DependentResource dr : index.get(resource)){
- Validator val = dr.getValidator();
- if (Friend.shouldValidate(val, dr.getResource(), ValType.Build, new ContentTypeWrapper())){
- _operation.getState().put(ValidationState.TriggerResource, resource);
- ValidationEvent event = new ValidationEvent(dr.getResource(), IResourceDelta.NO_CHANGE, delta);
- if (val.shouldClearMarkers(event))mm.clearMarker(dr.getResource(), val);
- ValManager.getDefault().validate(val, _operation, dr.getResource(),
- IResourceDelta.NO_CHANGE, _monitor, event);
- }
- }
- }
-
- return true;
- }
-
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
deleted file mode 100644
index ab2aebf..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
+++ /dev/null
@@ -1,19 +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;
-
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public interface ValConstants {
- /** problem marker for version 2 of the validation framework. */
- String ProblemMarker = ValidationPlugin.PLUGIN_ID +".problemmarker2"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
deleted file mode 100644
index 2c3a4bd..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
+++ /dev/null
@@ -1,1292 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.IPerformanceMonitor;
-import org.eclipse.wst.validation.IValidatorGroupListener;
-import org.eclipse.wst.validation.PerformanceCounters;
-import org.eclipse.wst.validation.ValidationEvent;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.operations.ManualValidatorsOperation;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * A central place to keep track of all the validators.
- * @author karasiuk
- *
- */
-public final class ValManager implements IValChangedListener, IFacetedProjectListener, IProjectChangeListener {
-
- /**
- * Projects may be allowed to override the global validation settings. If that is the case then those
- * project specific settings are saved here. If the key exists, but the value is null, then that
- * means that the project has been checked and it does not have any specific settings.
- */
- private final Map<IProject, ProjectPreferences> _projectPreferences =
- Collections.synchronizedMap(new HashMap<IProject, ProjectPreferences>(50));
-
- private final AtomicReference<GlobalPreferences> _globalPreferences = new AtomicReference<GlobalPreferences>();
-
- /**
- * This number increases each time any of the validation configurations change. It is used to determine
- * if information that we have cached in the ValProperty is stale or not. This starts off at zero, each time
- * the workbench is started.
- */
- private final AtomicInteger _configNumber = new AtomicInteger();
-
- private final ValidatorIdManager _idManager = new ValidatorIdManager();
- private final ValidatorCache _cache = new ValidatorCache();
-
- private static final QualifiedName StatusBuild = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sb"); //$NON-NLS-1$
- private static final QualifiedName StatusManual = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sm"); //$NON-NLS-1$
-
-
- public static ValManager getDefault(){
- return Singleton.valManager;
- }
-
- private ValManager(){
- ValPrefManagerGlobal.getDefault().addListener(this);
- ValPrefManagerProject.addListener(this);
- FacetedProjectFramework.addListener(this, IFacetedProjectEvent.Type.PROJECT_MODIFIED);
- EventManager.getManager().addProjectChangeListener(this);
- }
-
- /**
- * This needs to be called if the ValManager is ever deleted.
- */
- public void dispose(){
- // currently nobody calls this method, because this instance is never removed, but the method is
- // here for completeness none the less.
- ValPrefManagerGlobal.getDefault().removeListener(this);
- ValPrefManagerProject.removeListener(this);
- FacetedProjectFramework.removeListener(this);
- EventManager.getManager().removeProjectChangeListener(this);
- }
-
- /**
- * Answer all the registered validators. If you are planning on making changes to the validators,
- * and then saving them in a preference store then you probably want the getValidatorsCopy method.
- * Because if you make changes to the original validators, and since we only save differences,
- * there won't be any differences.
- *
- * @return Answer the validators in name sorted order. Answer an empty array if there are no validators.
- *
- * @see #getValidatorsCopy()
- */
- public Validator[] getValidators(){
- return getValidators(null);
- }
-
- /**
- * Answer copies of all the registered validators. If you are going to be making changes to the validators
- * and then saving them backing into the preference store, then this is the method to use.
- *
- * @return Answer an empty array if there are no validators.
- */
- public Validator[] getValidatorsCopy(){
- Validator[] orig = getValidators();
- Validator[] copy = new Validator[orig.length];
- for (int i=0; i<orig.length; i++)copy[i] = orig[i].copy();
- return copy;
- }
-
- /**
- * Answer all the validators for the given project.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If the project has it's own settings, then those validators are
- * returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param project
- * this may be null, in which case the global preferences are
- * returned.
- * @param respectOverrideSettings
- * if this is true then the validators that get returned are
- * based on the override settings. So for example, if the global
- * preferences do not allow project overrides then none of the
- * project settings are used. Normal validation would set this to true.
- * The properties page would set this to false.
- *
- * @deprecated Use {@link #getValidatorsNotCached(IProject)} instead
- */
- public Validator[] getValidators(IProject project, boolean respectOverrideSettings) throws ProjectUnavailableError {
- return getValidators(project);
- }
-
- /**
- * Answer a cached copy of the the validators for a given project. This is a front end method,
- * for the getValidatorsNotCached() method.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If the project has it's own settings, then those validators are
- * returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param project
- * This may be null, in which case the global preferences are
- * returned.
- *
- * @return The validators in name sorted order.
- */
- public Validator[] getValidators(IProject project) throws ProjectUnavailableError {
- return _cache.getValidatorsCached(project);
- }
-
- /**
- * Answer all the validators for the given project.
- * <p>
- * Individual projects may override the global validation preference
- * settings. If the project has it's own settings, then those validators are
- * returned via this method.
- * </p>
- * <p>
- * The following approach is used. For version 1 validators, the validator
- * is only returned if it is defined to operate on this project type. This
- * is the way that the previous version of the framework did it. For version
- * 2 validators, they are all returned.
- * </p>
- *
- * @param project
- * This may be null, in which case the global preferences are
- * returned.
- *
- * @return The validators in name sorted order.
- */
- private Validator[] getValidatorsNotCached(IProject project) throws ProjectUnavailableError {
- Map<String,Validator> v2Vals = getV2Validators(project, UseProjectPreferences.Normal);
- TreeSet<Validator> sorted = new TreeSet<Validator>();
- sorted.addAll(v2Vals.values());
-
- try {
- ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
- if (project == null){
- // If the project is null we need to use this approach, since you can not use new ManualValidatorsOperation(null)
- ValidatorMetaData[] vmds = vc.getValidators();
- for (ValidatorMetaData vmd : vmds){
- Validator v = Validator.create(vmd, vc, project);
- sorted.add(v);
- }
- }
- else {
- ManualValidatorsOperation mvo = new ManualValidatorsOperation(project);
- Set<ValidatorMetaData> vmds = mvo.getEnabledValidators();
- for (ValidatorMetaData vmd : vmds){
- Validator v = Validator.create(vmd, vc, project);
- sorted.add(v);
- }
- }
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- Validator[] vals = new Validator[sorted.size()];
- sorted.toArray(vals);
- return vals;
- }
- /**
- * Validators can use project level settings (Project natures and facets) to
- * determine if they are applicable to the project or not.
- *
- * @param project
- * The project that the configuration is based on.
- * @param mustUseProjectSettings
- * Force the project properties to be used. There is a case where the user has toggled the
- * Enable project specific settings checkbox in the dialog, but has not yet committed the
- * changes. This allows that setting to be passed through.
- * @return The validators that are configured to run on this project based
- * on the project level settings. These are the "live" validators, they are not copies.
- * @throws ProjectUnavailableError
- *
- * @deprecated Use getValidatorsConfiguredForProject(IProject project, UseProjectPreferences useProject)
- */
- public Validator[] getValidatorsConfiguredForProject(IProject project, boolean mustUseProjectSettings) throws ProjectUnavailableError {
- UseProjectPreferences useProject = UseProjectPreferences.Normal;
- return getValidatorsConfiguredForProject(project, useProject);
- }
-
- /**
- * Validators can use project level settings (Project natures and facets) to
- * determine if they are applicable to the project or not.
- *
- * @param project
- * The project that the configuration is based on.
- * @param useProject
- * Specifies how to use the project preferences. This can be used
- * to force the project properties to be used. There is a case
- * where the user has toggled the Enable project specific
- * settings checkbox in the dialog, but has not yet committed the
- * changes. This allows that setting to be passed through.
- * @return The validators that are configured to run on this project based
- * on the project level settings. These are the "live" validators,
- * they are not copies.
- * @throws ProjectUnavailableError
- */
- public Validator[] getValidatorsConfiguredForProject(IProject project, UseProjectPreferences useProject) throws ProjectUnavailableError {
- Map<String,Validator> v2Vals = getV2Validators(project, useProject);
- TreeSet<Validator> sorted = new TreeSet<Validator>();
- sorted.addAll(v2Vals.values());
-
- if (useProject == UseProjectPreferences.MustNotUse){
- sorted.addAll(ExtensionValidators.instance().getV1Validators(project));
- }
- else {
- try {
- ValidationConfiguration vc = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = vc.getValidators();
- for (ValidatorMetaData vmd : vmds) {
- Validator v = Validator.create(vmd, vc, project);
- sorted.add(v);
- }
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- List<Validator> list = new LinkedList<Validator>();
- for (Validator v : sorted){
- if (v.shouldValidateProject(project, false, false))list.add(v);
- }
-
- Validator[]vals = new Validator[list.size()];
- list.toArray(vals);
- return vals;
- }
-
- /**
- * Answer the V2 validators that are in effect for this project. The
- * following approach is used:
- * <ol>
- * <li>The validators that are defined by the extension point are loaded.</li>
- * <li>They are customized by any global preferences.</li>
- * <li>If project customizations are allowed, they are customized by the
- * project preferences.
- * </ol>
- *
- * @param project
- * This may be null, in which case only the global preferences
- * are used.
- * @param useProject
- * Specifies how to use the project preferences. This can be used
- * to force the project properties to be used. There is a case
- * where the user has toggled the Enable project specific
- * settings checkbox in the dialog, but has not yet committed the
- * changes. This allows that setting to be passed through.
- *
- * @return
- */
- private Map<String,Validator> getV2Validators(IProject project, UseProjectPreferences useProject){
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
- try {
- List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
- for (Validator v : vals)extVals.put(v.getId(), v);
-
- if (useProject != UseProjectPreferences.MustNotUse){
- if (useProject == UseProjectPreferences.MustUse || !mustUseGlobalValidators(project)){
- //TODO should probably cache this vpm
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- vals = vpm.getValidators(extVals);
- for (Validator v : vals)extVals.put(v.getId(), v);
-
- for (Validator v : getProjectPreferences(project).getValidators())extVals.put(v.getId(), v);
- }
- }
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return extVals;
- }
-
-
- /**
- * Answer true if we must use the global settings for this project. If the global preferences do not
- * allow overrides, or if this project does not allow overrides then the global preferences must be used.
- *
- * @param project project that is being tested. It can be null, in which case the global preferences must be used.
- * @return true if the global preferences must be used.
- */
- public boolean mustUseGlobalValidators(IProject project){
- if (project == null)return true;
- if (!getGlobalPreferences().getOverride())return true;
- ProjectPreferences pp = _projectPreferences.get(project);
- if (pp != null)return !pp.getOverride();
-
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- return !vpm.getOverride();
- }
-
- /**
- * Answer the validator with the given id that is in effect for the given project.
- *
- * @param id The validator id.
- * @param project
- * @return null if the validator is not found
- */
- public Validator getValidator(String id, IProject project){
- Validator[] vals = getValidators(project);
- for (Validator v : vals){
- if (v.getId().equals(id))return v;
- }
- return null;
- }
-
- /**
- * @see ValidationFramework#getValidator(String, IProject)
- */
- public Validator getValidatorWithId(String id, IProject project){
- Validator[] vals = getValidators(project);
- for (Validator v : vals){
- if (v.getId().equals(id))return v;
- }
- return null;
- }
-
- /**
- * Answer true if the resource has any enabled validators.
- *
- * @param resource a file, folder or project.
- *
- * @param isManual if true then the validator must be turned on for manual validation.
- * If false then the isManualValidation setting isn't used to filter out validators.
- *
- * @param isBuild if true then the validator must be turned on for build based validation.
- * If false then the isBuildValidation setting isn't used to filter out validators.
- */
- public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
- if (resource instanceof IProject){
- IProject project = (IProject)resource;
- return ValManager.getDefault().getValidators(project).length > 0;
- }
- else if (resource instanceof IFolder){
- IFolder folder = (IFolder)resource;
- HasValidatorVisitor v = new HasValidatorVisitor(isManual, isBuild);
- return v.hasValidator(folder);
- }
- else {
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : ValManager.getDefault().getValidators(resource.getProject())){
- if (Friend.shouldValidate(val, resource, isManual, isBuild, ctw))return true;
- }
- }
- return false;
- }
-
- /**
- * Answer true if the project has disabled all of it's validators, or if project overrides are not
- * allowed if global validation has been disabled.
- *
- * @param project the project that is being consulted, or null if only the global settings are to be
- * checked.
- */
- public boolean isDisabled(IProject project){
- GlobalPreferences gp = getGlobalPreferences();
- if (!gp.getOverride() || project == null)return gp.getDisableAllValidation();
-
- ProjectPreferences pp = _projectPreferences.get(project);
- if (pp == null)return gp.getDisableAllValidation();
- return pp.getSuspend();
- }
-
- /**
- * Answer all the registered validators as they were defined by the extension points. That is
- * answer the validators as if the user has never applied any customizations.
- *
- * @return Answer an empty array if there are no validators.
- */
- public static Validator[] getDefaultValidators() throws InvocationTargetException {
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2();
- TreeSet<Validator> sorted = new TreeSet<Validator>();
- for (Validator v : extVals.values())sorted.add(v);
-
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- GlobalConfiguration gc = new GlobalConfiguration(root);
- gc.resetToDefault();
- for (ValidatorMetaData vmd : gc.getValidators()){
- Validator v = Validator.create(vmd, gc, null);
- v.setBuildValidation(vmd.isBuildValidation());
- v.setManualValidation(vmd.isManualValidation());
- sorted.add(v);
- }
-
- Validator[] val = new Validator[sorted.size()];
- sorted.toArray(val);
- return val;
- }
-
- public static Validator[] getDefaultValidators(IProject project) throws InvocationTargetException {
- Map<String,Validator> extVals = ExtensionValidators.instance().getMap(project);
- Validator[] val = new Validator[extVals.size()];
- extVals.values().toArray(val);
- return val;
- }
-
- /**
- * Answer all the registered validators.
- *
- * @param project the project to use for getting the version 1 validator settings. This can
- * be null in which case the global preferences are used.
- *
- * @return Answer an empty array if there are no validators.
- */
-// Validator[] getValidators2(IProject project) throws ProjectUnavailableError {
-// // If I use a local variable I don't need to synchronize the method.
-//
-// Validator[] validators = _validators;
-// if (project == null && validators != null)return validators;
-//
-// Validator[] val = loadExtensions(false, project);
-// ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
-// if (!vpm.loadPreferences(val)){
-// val = restoreDefaults2(project);
-// saveStateTimestamp();
-// }
-// else {
-// if (getGlobalPreferences().getStateTimeStamp() != Platform.getStateStamp())
-// val = migrateSettings(val, project);
-// }
-//
-// TreeSet<Validator> set = new TreeSet<Validator>();
-// for (Validator v : val)set.add(v);
-//
-// List<Validator> list = new LinkedList<Validator>();
-// try {
-// ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
-// for (ValidatorMetaData vmd : vc.getValidators()){
-// list.add(Validator.create(vmd, vc, project));
-// }
-//
-// }
-// catch (InvocationTargetException e){
-// if (project != null && (!project.exists() || !project.isOpen()))
-// throw new ProjectUnavailableError(project);
-// ValidationPlugin.getPlugin().handleException(e);
-// }
-//
-// set.addAll(list);
-// val = new Validator[set.size()];
-// set.toArray(val);
-// if (project == null)_validators = val;
-// return val;
-// }
-
- /**
- * This method needs to be called whenever the validation configuration has changed.
- */
- private void configHasChanged(){
- _configNumber.incrementAndGet();
- ValidatorProjectManager.reset();
- _cache.reset();
- }
-
- /**
- * Answer the global validation preferences.
- */
- public GlobalPreferences getGlobalPreferences(){
- GlobalPreferences gp = _globalPreferences.get();
- if (gp == null){
- ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
- gp = vpm.loadGlobalPreferences();
- if (!_globalPreferences.compareAndSet(null, gp))gp = _globalPreferences.get();
- }
- return gp;
- }
-
- /**
- * Update the global preferences, but only if something has actually changed.
- * @param values The global settings.
- * @return a bit mask of the changes between the old values and the new values. See the GlobalPreferences
- * constants for the bit mask values. If a zero is return there were no changes.
- */
- public int replace(GlobalPreferencesValues values){
- GlobalPreferences gp = new GlobalPreferences(values);
- GlobalPreferences old = getGlobalPreferences();
- int changes = old.compare(gp);
- if (changes != 0){
- _globalPreferences.set(gp);
- }
- return changes;
- }
-
- /**
- * Answer the project preferences for this project.
- * @param project The project, this may be null.
- */
- public ProjectPreferences getProjectPreferences(IProject project) {
- ProjectPreferences pp = _projectPreferences.get(project);
- if (pp != null)return pp;
-
- /* hopefully we rarely get this far */
-
- Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
- try {
- List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
- for (Validator v : vals)extVals.put(v.getId(), v);
-
- pp = getProjectPreferences(project, extVals);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return pp;
- }
-
- /**
- *
- * @param project The project, this may be null.
- * @param baseValidators
- */
- private ProjectPreferences getProjectPreferences(IProject project, Map<String, Validator> baseValidators)
- throws BackingStoreException {
- ProjectPreferences pp = _projectPreferences.get(project);
- if (pp != null)return pp;
-
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- pp = vpm.loadProjectPreferences(project, baseValidators);
- _projectPreferences.put(project, pp);
- return pp;
- }
-
- /**
- * Restore all the validation defaults, as defined by the individual validators via the
- * validation extension point.
- */
-// public synchronized void restoreDefaults() {
-// getGlobalPreferences().resetToDefault();
-// _validators = null;
-// getValidators(true);
-// }
-
-
- /**
- * Run all the validators that are applicable to this resource.
- * <p>
- * If this is a manual validation both the version 1 and version 2 validators are run. If it
- * is a build validation, then only the version 2 validators are run, because the old framework handles
- * the running of the old validators.
- * </p>
- *
- * @param project project that is being validated
- *
- * @param resource the resource that is being validated
- *
- * @param kind the kind of resource delta. It will be one of the IResourceDelta constants, like
- * IResourceDelta.CHANGED for example.
- *
- * @param valType The type of validation request.
- * @param buildKind the kind of build that triggered this validation. See IncrementalProjectBuilder for values.
- * @param operation the operation that this validation is running under
- * @param monitor the monitor to use to report progress
- */
- public void validate(IProject project, final IResource resource, final int kind, ValType valType,
- int buildKind, ValOperation operation, final IProgressMonitor monitor) {
-
- MarkerManager.getDefault().deleteMarkers(resource, operation.getStarted(), IResource.DEPTH_ZERO);
-
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType vt,
- ValOperation operation, IProgressMonitor monitor) {
-
- Validator.V1 v1 = validator.asV1Validator();
- if (vt == ValType.Build && v1 != null)return;
-
- SubMonitor subMonitor = SubMonitor.convert(monitor);
- String task = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
- subMonitor.beginTask(task, 1);
- validate(validator, operation, resource, kind, subMonitor.newChild(1), null);
- }
- };
- SubMonitor sm = SubMonitor.convert(monitor, getValidators(project).length);
- accept(visitor, project, resource, valType, operation, sm);
-
- }
-
- /**
- * Validate a single resource with a single validator. This will call the validator whether the validator
- * is enabled or not.
- * <p>
- * Callers of this method should ensure that the shouldValidate was tested before making this call.
- *
- * @param validator the validator
- * @param operation the operation that the validation is running in.
- * @param resource the resource to validate
- * @param kind the kind of resource change. See IResourceDelta.
- * @param monitor
- */
- public void validate(Validator validator, ValOperation operation, IResource resource, int kind,
- IProgressMonitor monitor, ValidationEvent event){
- if (operation.isValidated(validator.getId(), resource))return;
- long time = 0;
- long cpuTime = -1;
- String msg1 = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
- monitor.subTask(msg1);
- IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
- if (pm.isCollecting()){
- time = System.currentTimeMillis();
- cpuTime = Misc.getCPUTime();
- }
-
- if (Tracing.matchesExtraDetail(validator.getId())){
- Tracing.log("ValManager-03: validating ", resource); //$NON-NLS-1$
- }
- ValidationResult vr = validator.validate(resource, kind, operation, monitor, event);
- if (pm.isCollecting()){
- if (cpuTime != -1){
- cpuTime = Misc.getCPUTime() - cpuTime;
- }
- int num = 0;
- if (vr != null)num = vr.getNumberOfValidatedResources();
- PerformanceCounters pc = new PerformanceCounters(validator.getId(),
- validator.getName(), resource.getName(),
- num, System.currentTimeMillis()-time, cpuTime);
- pm.add(pc);
- }
- if (ValidationPlugin.getPlugin().isDebugging() && !pm.isCollecting()){
- String msg = time != 0 ?
- NLS.bind(ValMessages.LogValEndTime, new Object[]{validator.getName(),
- validator.getId(), resource, Misc.getTimeMS(System.currentTimeMillis()-time)}) :
- NLS.bind(ValMessages.LogValEnd, validator.getName(), resource);
- Tracing.log("ValManager-01: " + msg); //$NON-NLS-1$
- }
- if (vr != null){
- operation.mergeResults(vr);
- if (vr.getSuspendValidation() != null)operation.suspendValidation(vr.getSuspendValidation(), validator);
- }
- }
-
- /**
- * Accept a visitor for all the validators that are enabled for the given project.
- *
- * @param visitor
- * @param project
- * @param valType the type of validation
- * @param operation
- * @param monitor
- */
- public void accept(IValidatorVisitor visitor, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor){
-
- if (isDisabled(project))return;
-
- for (Validator val : getValidators(project)){
- if (monitor.isCanceled())return;
- if (!ValidatorProjectManager.get().shouldValidate(val, project, valType))continue;
- if (operation.isSuspended(val, project))continue;
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
-
- /**
- * Accept a visitor for all the validators that are enabled for the given project, resource,
- * and validation mode.
- *
- * @param valType the type of validation request
- */
- public void accept(IValidatorVisitor visitor, IProject project, IResource resource,
- ValType valType, ValOperation operation, IProgressMonitor monitor){
-
- if (isDisabled(project))return;
-
- Map<String,IValidatorGroupListener[]> groupListeners = new HashMap<String,IValidatorGroupListener[]>();
-
- ValProperty vp = getValProperty(resource, valType, _configNumber.get());
- if (vp != null){
- BitSet bs = vp.getConfigSet();
- for (Validator val : getValidators(project)){
- if (!monitor.isCanceled()) {
- if (!bs.get(_idManager.getIndex(val.getId())))continue;
- if (operation.isSuspended(val, project))continue;
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null) {
- notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
- }
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
- return;
- }
-
- vp = new ValProperty();
- vp.setConfigNumber(_configNumber.get());
- ContentTypeWrapper ctw = new ContentTypeWrapper();
- for (Validator val : getValidators(project)){
- if (!monitor.isCanceled()) {
- if (!ValidatorProjectManager.get().shouldValidate(val, project, valType))continue;
- if (Friend.shouldValidate(val, resource, valType, ctw)){
- vp.getConfigSet().set(_idManager.getIndex(val.getId()));
- // we do the suspend check after figuring out if it needs to be validated, because we save
- // this information for the session.
- if (operation.isSuspended(val, project))continue;
- Validator.V2 v2 = val.asV2Validator();
- if (v2 != null) {
- notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
- }
- try {
- visitor.visit(val, project, valType, operation, monitor);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
- }
- }
- notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
- putValProperty(vp, resource, valType);
- }
-
- /**
- * Let the group listeners know that validation might be starting for the group of validators.
- */
- private void notifyGroupListenersStarting(final IResource resource,
- final ValidationState state, final IProgressMonitor monitor,
- Map<String, IValidatorGroupListener[]> groupListeners, Validator.V2 v2) {
-
- String[] groups = v2.getValidatorGroups();
- for (String group : groups) {
- if (!groupListeners.containsKey(group)) {
- IValidatorGroupListener[] createdListeners = null;
- try {
- createdListeners = ValidatorGroupExtensionReader.getDefault().createListeners(group);
- }
- catch (CoreException e){
- String msg = NLS.bind(ValMessages.ErrConfig, v2.getId());
- Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
- CoreException core = new CoreException(status);
- ValidationPlugin.getPlugin().handleException(core);
- ValidationPlugin.getPlugin().handleException(e);
-
- // we create this to ensure that we don't signal the same exception over and over.
- createdListeners = new IValidatorGroupListener[0];
- }
-
- // create and notify just this once
- final IValidatorGroupListener[] listeners = createdListeners;
-
- groupListeners.put(group, listeners);
- for (final IValidatorGroupListener listener : listeners) {
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- listener.validationStarting(resource, monitor, state);
- }
-
- public void handleException(Throwable exception) {
- ValidationPlugin.getPlugin().handleException(exception);
- }
- });
- }
- }
- }
- }
-
- /**
- * Let the group listeners know that validation is finished for the group of validators.
- */
- private void notifyGroupFinishing(final IResource resource,
- final ValidationState state, final IProgressMonitor monitor,
- Map<String, IValidatorGroupListener[]> groupListeners) {
- for (final IValidatorGroupListener[] listeners : groupListeners.values()) {
- for (final IValidatorGroupListener listener : listeners) {
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- listener.validationFinishing(resource, monitor, state);
- }
-
- public void handleException(Throwable exception) {
- ValidationPlugin.getPlugin().handleException(exception);
- }
- });
- }
- }
- }
-
- private ValProperty getValProperty(IResource resource, ValType valType, int configNumber) {
- ValProperty vp = null;
- try {
- if (valType == ValType.Build)vp = (ValProperty)resource.getSessionProperty(StatusBuild);
- else if (valType == ValType.Manual)vp = (ValProperty)resource.getSessionProperty(StatusManual);
- }
- catch (CoreException e){
- // don't care about this one
- }
- if (vp == null)return null;
- if (vp.getConfigNumber() != _configNumber.get())return null;
- return vp;
- }
-
- /**
- * Let the validation manager know that a project has been changed.
- *
- * @param project The project that has been opened, created, or had it's description change.
- */
- public void projectChanged(IProject project){
- ValidatorProjectManager.reset();
- _projectPreferences.remove(project);
- _cache.reset(project);
- }
-
- /**
- * Let the validation manager know that a project has been removed.
- *
- * @param project The project that has been closed or deleted.
- *
- */
- public void projectRemoved(IProject project){
- ValidatorProjectManager.reset();
- _projectPreferences.remove(project);
- _cache.reset(project);
- }
-
- private void putValProperty(ValProperty vp, IResource resource, ValType valType) {
- try {
- if (valType == ValType.Build)resource.setSessionProperty(StatusBuild, vp);
- else if (valType == ValType.Manual)resource.setSessionProperty(StatusManual, vp);
- }
- catch (CoreException e) {
- // If the resource is not found, it is likely just been deleted
- // and there is no need to do anything.
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=269022
- if (!e.getStatus().equals(IResourceStatus.RESOURCE_NOT_FOUND)) {
- ValidationPlugin.getPlugin().handleException(e, IStatus.WARNING);
- }
- }
- }
-
- /**
- * Let each of the enabled validators know that a clean has been requested.
- *
- * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
- * @param monitor
- */
- void clean(final IProject project, final ValOperation operation, final IProgressMonitor monitor) {
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.clean(project, operation, monitor);
- }
-
- };
- accept(visitor, project, ValType.Build, operation, monitor);
- }
-
- /**
- * Let each of the enabled validators know that a clean has been requested.
- *
- * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
- * @param monitor
- */
- public void clean(IProject project, IProgressMonitor monitor){
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.clean(project, operation, monitor);
- }
-
- };
- ValidationFramework.getDefault().getDependencyIndex().clear(project);
- ValOperation operation = new ValOperation();
- accept(visitor, project, ValType.Build, operation, monitor);
- }
-
- public void validatorsForProjectChanged(IProject project, boolean validationSettingChanged) {
- if (validationSettingChanged){
- if (project != null)_projectPreferences.remove(project);
- configHasChanged();
- }
- }
-
- private final class HasValidatorVisitor implements IResourceVisitor {
-
- private boolean _hasValidator;
- private final boolean _isManual;
- private final boolean _isBuild;
-
- public HasValidatorVisitor(boolean isManual, boolean isBuild){
- _isManual = isManual;
- _isBuild = isBuild;
- }
-
- public boolean hasValidator(IFolder folder){
- try {
- folder.accept(this);
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return _hasValidator;
- }
-
- public boolean visit(IResource resource) throws CoreException {
- if (resource instanceof IFolder)return true;
- if (hasValidators(resource, _isManual, _isBuild)){
- _hasValidator = true;
- return false;
- }
- return true;
- }
- }
-
- /**
- * Map validator id's to an index number on a bit set, so that we can quickly determine if a
- * particular validator needs to validate a particular resource.
- * @author karasiuk
- *
- */
- private final static class ValidatorIdManager {
-
- /**
- * Map validator id's to Integers. The integers correspond to bits in the ValProperty instances.
- */
- private final Map<String, Integer> _map = new HashMap<String, Integer>(100);
- private final Map<Integer, String> _reverseMap = new HashMap<Integer, String>(100);
-
- /** Next available bit. */
- private int _next;
-
- /**
- * Answer the index number for this validator. If we haven't seen it yet allocate a new index number.
- * @param id validator id.
- * @return index into the validator bit mask.
- */
- public synchronized int getIndex(String id){
- Integer i = _map.get(id);
- if (i != null)return i;
-
- i = _next++;
- _map.put(id, i);
- _reverseMap.put(i, id);
-
- return i;
- }
-
- /**
- * Answer the validator id for the index.
- * @param index
- * @return null if the index number has not been set.
- */
- public synchronized String getId(Integer index){
- return _reverseMap.get(index);
- }
-
- public synchronized void reset(){
- _map.clear();
- _reverseMap.clear();
- _next = 0;
- }
-
- /**
- * Answer the ids for the bit in the bitset. This is used for debugging.
- * @param bs
- */
- public synchronized String[] getIds(BitSet bs){
- List<String> list = new LinkedList<String>();
- for(int i=bs.nextSetBit(0); i>=0; i=bs.nextSetBit(i+1)) {
- String id = getId(i);
- if (id != null)list.add(id);
- }
- String[] s = new String[list.size()];
- return list.toArray(s);
- }
- }
-
- /**
- * This is used to keep track of which validators are enabled with which projects. We want to ensure
- * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
- * This is an immutable object.
- * @author karasiuk
- *
- */
- private final static class ValidatorProjectManager {
-
- private final static AtomicReference<ValidatorProjectManager> _me = new AtomicReference<ValidatorProjectManager>();
- private final static AtomicInteger _counter = new AtomicInteger();
-
- private final ValProjectMap _manual = new ValProjectMap(ValType.Manual);
- private final ValProjectMap _build = new ValProjectMap(ValType.Build);
- private final int _sequence;
-
- /**
- * Answer the most current ValidatorProjectManager creating a new one if you have to.
- * @return
- */
- public static ValidatorProjectManager get(){
- ValidatorProjectManager vpm = _me.get();
- if (vpm != null)return vpm;
-
- int next = _counter.incrementAndGet();
- ValidatorProjectManager newVpm = null;
- boolean looking = true;
- while(looking){
- vpm = _me.get();
- if (vpm == null || next > vpm.getSequence()){
- if (newVpm == null)newVpm = new ValidatorProjectManager(next);
- if (_me.compareAndSet(vpm, newVpm))return newVpm;
- }
- else looking = false;
- }
- return vpm;
- }
-
- /**
- * Reset the ValidatorProjectManager to null, which will force a newer one to be created the next time
- * that it is requested.
- */
- public static void reset(){
- int next = _counter.incrementAndGet();
- ValidatorProjectManager vpm = _me.get();
- if ( vpm == null)return;
- if (next > vpm.getSequence())_me.compareAndSet(vpm, null);
- }
-
- private ValidatorProjectManager(int sequence){
- _sequence = sequence;
- }
-
- int getSequence(){
- return _sequence;
- }
-
- /**
- * Should this validator attempt to validate any resources in this project?
- *
- * @param validator
- * The validator that is being tested.
- * @param project
- * The project that is being tested. This can be null, which
- * means that all projects will be tested.
- * @param type
- * The type of validation operation.
- * @return true if the validator should attempt to validate.
- */
- public boolean shouldValidate(Validator validator, IProject project, ValType type){
- if (type == ValType.Build)return _build.shouldValidate(validator, project);
- if (type == ValType.Manual)return _manual.shouldValidate(validator, project);
-
- return false;
- }
-
- /**
- * This is used to keep track of which validators are enabled for which projects. We want to ensure
- * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
- * <p>
- * There are two reasons why a validator may not be enabled. It's current project level filters may not match
- * the project. Or the entire validator may have been turned off for the project.
- * </p>
- * @author karasiuk
- *
- */
- private final static class ValProjectMap {
- /**
- * Map a validator to the projects that it validates. This is an immutable object.
- * <p>
- * I've gone back and forth on whether the key should
- * be a Validator or the validator id. I'm back to it being the id because I was
- * running into cases where because of copying I wasn't getting the matches that I expected and I
- * want to ensure that I don't leak validators. If I run into
- * false matches, it is probably because reset isn't being called when it should be.
- * </p>
- */
- private final Map<String, Set<IProject>> _map;
-
- private final ValType _type;
-
- public ValProjectMap(ValType type){
- _type = type;
- _map = load();
- }
-
- /**
- * Should this validator attempt to validate any resources in this project?
- *
- * @param validator
- * The validator that is being tested.
- * @param project
- * The project that is being tested. This can be null, which
- * means that all projects will be tested, and if any of them return true,
- * then true is answered for this method.
- *
- * @return true if the validator should attempt to validate.
- */
- public boolean shouldValidate(Validator validator, IProject project){
- String vid = validator.getId();
- Set<IProject> projects = _map.get(vid);
- if (projects == null)return false;
- if (project == null)return projects.size() > 0;
- return projects.contains(project);
- }
-
- /**
- * For each of the projects in the workspace, load which validators are currently prepared to validate things.
- */
- private Map<String, Set<IProject>> load() {
- Map<String, Set<IProject>> map = new HashMap<String, Set<IProject>>(50);
- ValManager vm = ValManager.getDefault();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- Tracing.log("ValManager-02: loading " + projects.length + " projects"); //$NON-NLS-1$//$NON-NLS-2$
- for (IProject project : projects){
- if (!project.isOpen())continue;
- Validator[] vals = vm.getValidators(project);
- for (Validator v : vals){
- String vid = v.getId();
- Set<IProject> set = map.get(vid);
- if (set == null){
- set = new HashSet<IProject>(50);
- map.put(vid, set);
- }
-
- if (v.shouldValidateProject(project, _type))set.add(project);
- }
- }
- return map;
- }
-
- }
-
- }
-
- public void handleEvent(IFacetedProjectEvent event) {
- _configNumber.incrementAndGet();
- projectChanged(event.getProject().getProject());
- }
-
- public void projectChanged(IProject project, int type) {
- switch (type){
- case IProjectChangeListener.ProjectClosed:
- case IProjectChangeListener.ProjectDeleted:
- projectRemoved(project);
- break;
- case IProjectChangeListener.ProjectOpened:
- case IProjectChangeListener.ProjectChanged:
- case IProjectChangeListener.ProjectAdded:
- projectChanged(project);
- break;
- }
- }
-
- /**
- * Store the singleton for the ValManager. This approach is used to avoid having to synchronize the
- * ValManager.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private static class Singleton {
- static ValManager valManager = new ValManager();
- }
-
- private final class ValidatorCache {
- private final ConcurrentMap<IProject, Validator[]> _cache = new ConcurrentHashMap<IProject, Validator[]>(50);
- private final AtomicReference<Validator[]> _global = new AtomicReference<Validator[]>();
-
- public Validator[] getValidatorsCached(IProject project) throws ProjectUnavailableError {
- Validator[] vals = null;
- if (project == null){
- vals = _global.get();
- if (vals == null){
- vals = getValidatorsNotCached(project);
- _global.set(vals);
- }
- }
- else {
- vals = _cache.get(project);
- if (vals == null){
- vals = getValidatorsNotCached(project);
- _cache.put(project, vals);
- }
- }
- return vals;
- }
-
- public void reset(){
- _cache.clear();
- _global.set(null);
- }
-
- public void reset(IProject project){
- if (project != null)_cache.remove(project);
- }
-
- }
-
- public enum UseProjectPreferences {Normal, MustUse, MustNotUse}
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
deleted file mode 100644
index 02aabe1..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
+++ /dev/null
@@ -1,89 +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.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ValMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.messages"; //$NON-NLS-1$
-
- public static String ConfigError;
-
- public static String DecodeError1;
- public static String Error20;
-
- public static String ErrConfig;
- public static String ErrFilterRule;
- public static String ErrGroupName;
- public static String ErrDependencyVersion;
-
- public static String ErrGroupNoType;
- public static String ErrGroupInvalidType;
-
- public static String ErrPatternAttrib;
- public static String ErrTypeReq;
- public static String ErrType;
-
- public static String VbfExcSyntaxNoValClass;
- public static String VbfExcSyntaxNoValRun;
- public static String VbfExcSyntaxNoValNull;
-
- public static String GroupInclude;
-
- public static String GroupExclude;
-
- public static String JobName;
- public static String JobNameMonitor;
-
- public static String JobIndexSave;
-
- public static String LogValStart;
- public static String LogValEnd;
- public static String LogValEndTime;
- public static String LogValSummary;
- public static String LogValSummary2;
- public static String LogSession;
-
- public static String MigrationJobName;
-
- public static String RuleProjectNature;
- public static String RuleFileExt;
- public static String RuleFile;
- public static String RuleFolder;
- public static String RuleFull;
- public static String RuleContentType;
- public static String RuleFacet;
-
- public static String ContentTypeExact;
- public static String ContentTypeNotExact;
-
- public static String FileExtWithCase;
- public static String FileExtWithoutCase;
-
- public static String SevError;
- public static String SevWarning;
- public static String SevIgnore;
-
- public static String TimeUnder;
- public static String TimeNano;
- public static String TimeMicro;
- public static String TimeSec;
- public static String TimeMin;
-
- public static String TypeInclude;
- public static String TypeExclude;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ValMessages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
deleted file mode 100644
index 44c78ec..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
+++ /dev/null
@@ -1,205 +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.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.Validator;
-
-/**
- * This represents a validation operation, i.e. the running of a set of validators in response to some change.
- * It may be a large operation, as would happen on a clean build, or it may be the validation of just a single
- * resource.
- * <p>
- * The operation can, but doesn't need to, span multiple projects.
- * </p>
- * <p>
- * Once the operation has finished, this object goes away.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValOperation {
-
- private final ValidationState _state = new ValidationState();
- private final ValidationResult _result = new ValidationResult();
-
- /**
- * Each project can have a set of validators that are suspended for the duration of the validation operation.
- * The set contains the validator's id.
- */
- private final Map<IProject, Set<String>> _suspended = new HashMap<IProject, Set<String>>(40);
-
- /** The time that the operation started. */
- private final long _started = System.currentTimeMillis();
-
- /**
- * Are we in a multi project validation? That is, could we be validating several
- * projects at the same time? This can be triggered by either clean all or
- * if auto build is turned off, a build all.
- */
- private final boolean _multiProject;
-
- /**
- * Holds all the resources that have been validated as a side-effect of running other validations.
- * The key is the validator id and the value is a Set of IResources.
- */
- private final Map<String, Set<IResource>> _validated = new HashMap<String, Set<IResource>>(20);
-
- public ValOperation(){
- _multiProject = false;
- }
-
- /**
- *
- * @param multiProject Set to true if we could be validating several projects at the same time.
- */
- public ValOperation(boolean multiProject){
- _multiProject = multiProject;
- }
-
- public ValidationState getState() {
- return _state;
- }
-
- /**
- * Answer a summary of the validation results.
- * @return
- */
- public ValidationResultSummary getResult() {
- synchronized(_result){
- ValidationResultSummary vrs = new ValidationResultSummary(_result.getSeverityError(),
- _result.getSeverityWarning(), _result.getSeverityInfo());
- return vrs;
- }
- }
-
- /**
- * Answer a copy of the ValidationResult.
- * @return
- */
- public ValidationResults getResults(){
- return new ValidationResults(_result);
- }
-
- /**
- * Remember that this resource has already been validated as a side-effect.
- *
- * @param id id of the validator
- * @param resource resource that has been validated.
- */
- public void addValidated(String id, IResource resource){
- synchronized(_validated){
- Set<IResource> set = _validated.get(id);
- if (set == null){
- set = new HashSet<IResource>(20);
- _validated.put(id, set);
- }
- set.add(resource);
- }
- }
-
- /**
- * Answer if this resource has already been validated as a side-effect of some other validation by the
- * given validator.
- *
- * @param id
- * @param resource
- */
- public boolean isValidated(String id, IResource resource){
- synchronized(_validated){
- Set<IResource> set = _validated.get(id);
- if (set == null)return false;
-
- return set.contains(resource);
- }
- }
-
- /**
- * Has this validator been suspended for the duration of this operation on this project?
- *
- * @param val
- * The validator that is being checked.
- * @param project
- * Can be null, in which case we return false.
- *
- * @return true if this validator should not run on this project.
- */
- public boolean isSuspended(Validator val, IProject project) {
- if (project == null)return false;
- synchronized(_suspended){
- Set<String> set = getSuspended(project);
- return set.contains(val.getId());
- }
- }
-
- private Set<String> getSuspended(IProject project){
- Set<String> set = _suspended.get(project);
- if (set == null){
- set = new HashSet<String>(5);
- _suspended.put(project, set);
- }
- return set;
- }
-
- void suspendValidation(IProject project, Validator validator) {
- if (project == null)return;
- if (validator == null)return;
- getSuspended(project).add(validator.getId());
- }
-
- public long getStarted() {
- return _started;
- }
-
- public boolean isMultiProject() {
- return _multiProject;
- }
-
- /**
- * Indicate if the operation was canceled.
- *
- * @param canceled
- * Set to true if it was canceled and false if it was not canceled.
- */
- public void setCanceled(boolean canceled) {
- synchronized (_result) {
- _result.setCanceled(canceled);
- }
-
- }
-
- /**
- * Was the operation canceled before it completed? For example if the validation is being run through the
- * user interface, the end user can cancel the operation through the progress monitor.
- *
- * @return true if the operation was canceled
- */
- public boolean isCanceled() {
- synchronized (_result) {
- return _result.isCanceled();
- }
- }
-
- public void mergeResults(ValidationResult vr) {
- synchronized (_result) {
- _result.mergeResults(vr);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
deleted file mode 100644
index 5fcbaf3..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
+++ /dev/null
@@ -1,653 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * A class that knows how to manage the global persisted validation settings.
- * @author karasiuk
- */
-public final class ValPrefManagerGlobal {
-
- /**
- * Version of the framework properties.
- * <ul>
- * <li>Version 2 - used the filter approach
- * <li>Version 3 - switched to a difference based approach. (See Bugzilla 224179)
- * </ul>
- *
- */
- public final static int frameworkVersion = 3;
-
- private final Set<IValChangedListener> _listeners = new CopyOnWriteArraySet<IValChangedListener>();
-
- private final AtomicReference<List<Validator>> _validators = new AtomicReference<List<Validator>>();
-
- private ValPrefManagerGlobal(){}
-
- public static ValPrefManagerGlobal getDefault(){
- return Singleton.valPrefManagerGlobal;
- }
-
- public void addListener(IValChangedListener listener){
- _listeners.add(listener);
- }
-
- public void removeListener(IValChangedListener listener){
- _listeners.remove(listener);
- }
-
- private void updateListeners(boolean validationSettingChanged){
- for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(null, validationSettingChanged);
- }
-
- /**
- * Update the validator filters from the preference store.
- *
- * @param val
- *
- * @return false if there are no preferences, that means that the user has never changed any
- * of the default settings. Also answer false if there was some sort of error, which essentially
- * means that the preferences aren't valid for whatever reason.
- *
- * @deprecated
- */
-// public boolean loadPreferences(Validator[] val) {
-//
-// try {
-// IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
-// if (!pref.nodeExists(PrefConstants.filters))return false;
-//
-// Preferences filters = pref.node(PrefConstants.filters);
-// for (Validator v : val){
-// String id = v.getId();
-// if (filters.nodeExists(id)){
-// Preferences vp = filters.node(id);
-// loadPreferences(v, vp);
-// }
-// }
-// }
-// catch (Exception e){
-// ValidationPlugin.getPlugin().handleException(e);
-// return false;
-// }
-//
-// return true;
-// }
-
- /**
- * Answer the v2 validators that have been overridden by the global preferences.
- */
- public List<Validator> getValidators() throws BackingStoreException {
- List<Validator> vals = _validators.get();
- while (vals == null){
- vals = loadValidators();
- if (!_validators.compareAndSet(null, vals))vals = _validators.get();
- }
- return vals;
- }
-
- /**
- * Load the validators from the preference store.
- * @return the validators that have been overridden by the global references.
- */
- private List<Validator> loadValidators() throws BackingStoreException {
- LinkedList<Validator> list = new LinkedList<Validator>();
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
- if (pref.nodeExists(PrefConstants.vals)){
- PreferencesWrapper vals = pref.node(PrefConstants.vals);
- for (String id : vals.childrenNames()){
- Validator base = ExtensionValidators.instance().getMapV2().get(id);
- Validator v = loadValidator(id, vals, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Global);
- list.add(v);
- }
- }
- }
- return list;
- }
-
- /**
- * Answer a copy of the validator that has been updated with the given preferences.
- *
- * @param id
- * Validator id.
- * @param valsNode
- * The /vals node in the preference store.
- * @param base
- * The base validator that is being customized. This can be null,
- * in which case null will be returned.
- *
- * @return A new validator that is a copy of the extension point validator
- * with the updates from the preference store.
- */
- static Validator loadValidator(String id, PreferencesWrapper valsNode, Validator base) {
- if (base == null)return null;
-
- PreferencesWrapper vp = valsNode.node(id);
- base = base.copy();
- V2 v2 = base.asV2Validator();
-
- String global = vp.get(PrefConstants.global, ""); //$NON-NLS-1$
- if (global.length() > 0){
- Global g = new Global(global);
- base.setBuildValidation(g.isBuild());
- base.setManualValidation(g.isManual());
- base.setDelegatingId(g.getDelegating());
- }
-
- if (v2 != null){
- String groups = vp.get(PrefConstants.groups, ""); //$NON-NLS-1$
- if (groups.length() > 0){
- List<FilterGroup> list = new LinkedList<FilterGroup>();
- Deserializer des = new Deserializer(groups);
- while(des.hasNext())list.add(FilterGroup.create(des));
- v2.setGroups(list);
- }
- }
- return base;
- }
-
- /**
- * The only valid way to get the global preferences is through the ValManager.
- *
- * @see ValManager#getGlobalPreferences()
- */
- public GlobalPreferences loadGlobalPreferences() {
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
- GlobalPreferencesValues gp = new GlobalPreferencesValues();
- gp.saveAutomatically = pref.getBoolean(PrefConstants.saveAuto, GlobalPreferences.DefaultAutoSave);
- gp.disableAllValidation = pref.getBoolean(PrefConstants.suspend, GlobalPreferences.DefaultSuspend);
- gp.confirmDialog = pref.getBoolean(PrefConstants.confirmDialog, GlobalPreferences.DefaultConfirm);
- gp.override = pref.getBoolean(PrefConstants.override, GlobalPreferences.DefaultOverride);
- gp.version = pref.getInt(PrefConstants.frameworkVersion, GlobalPreferences.DefaultFrameworkVersion);
- gp.stateTimeStamp = pref.getLong(PrefConstants.stateTS, 0);
-
- if (gp.version != frameworkVersion)migrate(gp.version, pref);
- return new GlobalPreferences(gp);
- }
-
- /**
- * If necessary migrate the preferences.
- * @param version The incoming version of the preferences.
- * @param pref the root of the preference store
- */
- static void migrate(int version, PreferencesWrapper pref) {
- try {
- boolean update = false;
- if (version == 2){
- if (pref.nodeExists(PrefConstants.filters)){
- pref.node(PrefConstants.filters).removeNode();
- update = true;
- }
- if (pref.nodeExists(PrefConstants.msgs)){
- pref.node(PrefConstants.msgs).removeNode();
- update = true;
- }
- }
- if (update){
- pref.putInt(PrefConstants.frameworkVersion, frameworkVersion);
- pref.flush();
- }
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Load the preferences for a validator.
- *
- * @param v the validator that is being built up
- * @param p the node in the preference tree for the validator,
- * e.g. /instance/validator-framework-id/filters/validator-id
- *
- * @deprecated
- */
-// static void loadPreferences(Validator v, Preferences p) throws BackingStoreException {
-// v.setBuildValidation(p.getBoolean(PrefConstants.build, true));
-// v.setManualValidation(p.getBoolean(PrefConstants.manual, true));
-// v.setVersion(p.getInt(PrefConstants.version, 1));
-// v.setDelegatingId(p.get(PrefConstants.delegate, null));
-//
-// Validator.V2 v2 = v.asV2Validator();
-// if (v2 == null)return;
-// if (!p.nodeExists(PrefConstants.groups))return;
-//
-// Preferences groupNode = p.node(PrefConstants.groups);
-// for (String groupName : groupNode.childrenNames()){
-// Preferences group = groupNode.node(groupName);
-// String type = group.get(PrefConstants.type, null);
-// if (type == null)throw new IllegalStateException(ValMessages.ErrGroupNoType);
-// FilterGroup fg = FilterGroup.create(type);
-// if (fg == null)throw new IllegalStateException(NLS.bind(ValMessages.ErrGroupInvalidType, type));
-// v2.add(fg);
-//
-// if (group.nodeExists(PrefConstants.rules)){
-// Preferences ruleNode = group.node(PrefConstants.rules);
-// for (String ruleName : ruleNode.childrenNames()){
-// Preferences rule = ruleNode.node(ruleName);
-// FilterRule fr = FilterRule.create(rule.get(PrefConstants.ruleType, null));
-// if (fr != null){
-// fr.load(rule);
-// fg.add(fr);
-// }
-// }
-// }
-// }
-// }
-
- /**
- * Save the validator into the preference store.
- *
- * @param validator
- * The validator being saved.
- *
- * @param root
- * The top of the preference tree for validators, i.e.
- * /instance/validator-framework-id/vals for workspace validators
- * and /vals for project validators.
- *
- * @param baseValidators
- * A map of the validators that are one level higher in the
- * storage hierarchy. So if we are updating the preference page
- * validators, then this map would be the extension point
- * validators. If we are updating a project's validators, then
- * this map would be the preference page validators.
- */
- static void save(Validator validator, PreferencesWrapper root, Map<String, Validator> baseValidators) throws BackingStoreException {
- Validator.V2 v2 = validator.asV2Validator();
- if (v2 == null)return;
-
- final String id = validator.getId();
- boolean hasNode = root.nodeExists(id);
-
- if (validator.sameConfig(baseValidators.get(id))){
- if (hasNode){
- PreferencesWrapper vp = root.node(id);
- vp.removeNode();
- }
- return;
- }
- if (!validator.isChanged())return;
- PreferencesWrapper vp = root.node(id);
- if (validator.hasGlobalChanges()){
- Global g = new Global(validator.isManualValidation(), validator.isBuildValidation(), validator.getVersion(),
- validator.getDelegatingId());
- vp.put(PrefConstants.global, g.serialize());
- Friend.setMigrated(validator, false);
- }
-
- if (validator.getChangeCountMessages() > 0){
- Collection<MessageSeveritySetting> msgs = validator.getMessageSettings().values();
- if (msgs.size() > 0){
- vp.put(PrefConstants.msgs, Msgs.serialize(msgs));
- }
- }
-
- if (v2.getChangeCountGroups() > 0){
- FilterGroup[] groups = v2.getGroups();
- if (groups.length > 0){
- Serializer ser = new Serializer(500);
- for (FilterGroup group : groups)group.save(ser);
- vp.put(PrefConstants.groups, ser.toString());
- }
- }
- }
- /**
- * Save the validator into the preference store.
- *
- * @param validator
- * The validator being saved.
- *
- * @param root
- * The top of the preference tree for validators, i.e.
- * /instance/validator-framework-id/vals for workspace validators
- * and /vals for project validators.
- *
- * @param baseValidators
- * A map of the validators that are one level higher in the
- * storage hierarchy. So if we are updating the preference page
- * validators, then this map would be the extension point
- * validators. If we are updating a project's validators, then
- * this map would be the preference page validators.
- */
- static void save(ValidatorMutable validator, PreferencesWrapper root, Map<String, Validator> baseValidators) throws BackingStoreException {
- if (!validator.isV2Validator())return;
-
- PreferencesWrapper vp = root.node(validator.getId());
- if (validator.sameConfig(baseValidators.get(validator.getId()))){
- vp.removeNode();
- return;
- }
- if (!validator.isChanged())return;
- if (validator.hasGlobalChanges()){
- Global g = new Global(validator.isManualValidation(), validator.isBuildValidation(), validator.getVersion(),
- validator.getDelegatingId());
- vp.put(PrefConstants.global, g.serialize());
-// Friend.setMigrated(validator, false);
- }
-
- if (validator.getChangeCountGroups() > 0){
- FilterGroup[] groups = validator.getGroups();
- if (groups.length > 0){
- Serializer ser = new Serializer(500);
- for (FilterGroup group : groups)group.save(ser);
- vp.put(PrefConstants.groups, ser.toString());
- }
- }
- }
-
- public void saveAsPrefs(Validator[] val) {
- try {
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
- PreferencesWrapper vals = pref.node(PrefConstants.vals);
- Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
- for (Validator v : val)save(v, vals, base);
- pref.flush();
- _validators.set(null);
- updateListeners(true);
- }
- catch (BackingStoreException e){
- throw new RuntimeException(e);
- }
- }
-
-
- /**
- * Save the global preferences and the validators.
- */
- public synchronized void savePreferences(GlobalPreferences gp, Validator[] validators){
- try {
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
- savePreferences(prefs, gp);
- PreferencesWrapper vals = prefs.node(PrefConstants.vals);
-
- Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
- for (Validator v : validators)save(v, vals, base);
- prefs.flush();
- _validators.set(null);
- updateListeners(true);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Save the global preferences and the validators.
- */
- public synchronized void savePreferences(GlobalPreferences gp, ValidatorMutable[] validators, Boolean persist){
- try {
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, persist);
- savePreferences(prefs, gp);
- PreferencesWrapper vals = prefs.node(PrefConstants.vals);
- Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
- for (ValidatorMutable v : validators)save(v, vals, base);
-
- prefs.flush();
- _validators.set(null);
- updateListeners(true);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Save the V1 preferences, so that the old validators continue to work.
- */
- public static void saveV1Preferences(ValidatorMutable[] validators, Boolean persistent){
- try {
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
- gc.setEnabledManualValidators(getEnabledManualValidators(validators));
- gc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
-
- gc.passivate();
- gc.store(persistent);
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Answer all the V1 validators that are manually enabled.
- * @return
- */
- private static ValidatorMetaData[] getEnabledManualValidators(ValidatorMutable[] validators) {
- 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 static ValidatorMetaData[] getEnabledBuildValidators(ValidatorMutable[] validators) {
- 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;
- }
-
-
- /**
- * Save the global preferences and the validators.
- */
- public synchronized void savePreferences(){
- try {
- GlobalPreferences gp = ValManager.getDefault().getGlobalPreferences();
- PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
- savePreferences(prefs, gp);
- prefs.flush();
- updateListeners(true);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Save the global preferences and the validators.
- */
- private void savePreferences(PreferencesWrapper prefs, GlobalPreferences gp){
- prefs.putBoolean(PrefConstants.saveAuto, gp.getSaveAutomatically());
- prefs.putBoolean(PrefConstants.suspend, gp.getDisableAllValidation());
- prefs.putLong(PrefConstants.stateTS, gp.getStateTimeStamp());
- prefs.putBoolean(PrefConstants.confirmDialog, gp.getConfirmDialog());
- prefs.putBoolean(PrefConstants.override, gp.getOverride());
- prefs.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- }
-
- /**
- * Update any message preferences in the map.
- * @param validator
- * @param settings
- */
- public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
- try {
- loadMessageSettings(validator, settings, pref);
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Load the message preferences for the validator into the map.
- *
- * @param val
- * @param settings
- * @param root the root of the preference store
- */
- static void loadMessageSettings(Validator val, Map<String, MessageSeveritySetting> settings, PreferencesWrapper root)
- throws BackingStoreException {
- if (!root.nodeExists(PrefConstants.vals))return;
-
- PreferencesWrapper vals = root.node(PrefConstants.vals);
- if (!vals.nodeExists(val.getId()))return;
-
- PreferencesWrapper valPrefs = vals.node(val.getId());
- String msgs = valPrefs.get(PrefConstants.msgs, ""); //$NON-NLS-1$
- if (msgs.length() == 0)return;
-
- Map<String, MessageSeveritySetting.Severity> map = Msgs.deserialize(msgs);
-
- for (Map.Entry<String, MessageSeveritySetting.Severity> me : map.entrySet()){
- MessageSeveritySetting ms = settings.get(me.getKey());
- if (ms != null)ms.setCurrent(me.getValue());
- }
- }
-
- /**
- * Save whether the validator is enabled or not.
- * @param validator
- * @param prefs up to the filter part of the preference tree
- */
-// private void saveShallowPreference(Validator validator, Preferences prefs) {
-// if (validator.asV2Validator() == null)return;
-// Preferences val = prefs.node(validator.getId());
-// val.putBoolean(PrefConstants.build, validator.isBuildValidation());
-// val.putBoolean(PrefConstants.manual, validator.isManualValidation());
-// val.putInt(PrefConstants.version, validator.getVersion());
-// }
-
-// /**
-// * Load the customized message settings from the preference store.
-// * @param messageSettings
-// */
-// public void loadMessageSettings(Validator val, MessageCategory[] messageSettings) {
-// try {
-// loadMessageSettings(val, messageSettings, ValidationFramework.getDefault().getPreferenceStore());
-// }
-// catch (Exception e){
-// ValidationPlugin.getPlugin().handleException(e);
-// }
-// }
-
- private final static class Global {
- private final boolean _manual;
- private final boolean _build;
- private final int _version;
- private final String _delegating;
-
- public Global(String value){
- Deserializer d = new Deserializer(value);
- _manual = d.getBoolean();
- _build = d.getBoolean();
- _version = d.getInt();
- _delegating = d.hasNext() ? d.getString() : null;
- }
-
- public Global(boolean manual, boolean build, int version, String delegating){
- _manual = manual;
- _build = build;
- _version = version;
- _delegating = delegating;
- }
-
- public String serialize(){
- Serializer s = new Serializer(50);
- s.put(_manual);
- s.put(_build);
- s.put(_version);
- if (_delegating != null)s.put(_delegating);
- return s.toString();
- }
-
- public boolean isManual() {
- return _manual;
- }
-
- public boolean isBuild() {
- return _build;
- }
-
- public int getVersion() {
- return _version;
- }
-
- public String getDelegating() {
- return _delegating;
- }
- }
-
- private final static class Msgs {
- public static String serialize(Collection<MessageSeveritySetting> messages){
- Serializer s = new Serializer(100);
- for (MessageSeveritySetting ms : messages){
- s.put(ms.getId());
- s.put(ms.getCurrent().ordinal());
- }
- return s.toString();
- }
-
- /**
- * Answer a map for all the messages.
- * The key is the message id and the value is the current setting for that message
- * @param v
- * @return
- */
- public static Map<String, MessageSeveritySetting.Severity> deserialize(String v){
- Map<String, MessageSeveritySetting.Severity> map = new HashMap<String, MessageSeveritySetting.Severity>(10);
- Deserializer d = new Deserializer(v);
- while(d.hasNext()){
- String id = d.getString();
- int sev = d.getInt();
- map.put(id, MessageSeveritySetting.Severity.values()[sev]);
- }
- return map;
- }
- }
-
- /**
- * Store the singleton for the ValPrefManagerGlobal. This approach is used to avoid having to synchronize the
- * ValPrefManagerGlobal.getDefault() method.
- *
- * @author karasiuk
- *
- */
- private final static class Singleton {
- final static ValPrefManagerGlobal valPrefManagerGlobal = new ValPrefManagerGlobal();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
deleted file mode 100644
index c28b031..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
+++ /dev/null
@@ -1,388 +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.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.Friend;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.MutableProjectSettings;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * A class that knows how to manage the project level persisted validation settings.
- * @author karasiuk
- *
- */
-public final class ValPrefManagerProject {
-
- private final IProject _project;
- private final static List<IValChangedListener> _listeners = new LinkedList<IValChangedListener>();
-
- /**
- * The validators that are in the project preference file, but have
- * only been configured to the global preference level. That is they have not had
- * any project level customizations applied yet.
- */
- private List<Validator> _validators;
-
- public ValPrefManagerProject(IProject project){
- assert project != null;
- _project = project;
- }
-
- public static void addListener(IValChangedListener listener){
- if (_listeners.contains(listener))return;
- _listeners.add(listener);
- }
-
- public static void removeListener(IValChangedListener listener){
- _listeners.remove(listener);
- }
-
- private static void updateListeners(IProject project){
- for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(project, true);
- }
-
-
- /**
- * Answer whether or not this project has validation settings.
- *
- * @return true if it has settings. This does not mean that the settings are enabled, only that it
- * has settings.
- *
- * @deprecated
- */
- public boolean hasProjectSpecificSettings(){
- PreferencesWrapper pref = getPreferences(null);
-
- if (pref == null)return false;
- return true;
- }
-
- /**
- * Answer the v2 validators that have been overridden by the project
- * preferences. The validators will not have the preference store's
- * customizations applied yet. The purpose of this method, is to identify the subset of validators
- * that may later be configured.
- *
- * @param baseValidators
- * V2 validators from the extension points, and customized by any
- * global preferences.
- */
- public List<Validator> getValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
- List<Validator> vals = _validators;
- if (vals == null){
- vals = loadValidators(baseValidators);
- _validators = vals;
- }
- return vals;
- }
-
- /**
- * Load the validators from the preference store. The validators will not have the preference store's
- * customizations applied yet. The purpose of this method, is to identify the subset of validators
- * that may later be configured.
- *
- * @param baseValidators
- * V2 validators from the extension points, and customized by any
- * global preferences.
- * @return the validators that are in the project preference file, but have
- * only been configured to the global preference level. That is they have not had
- * any project level customizations applied yet.
- */
- private List<Validator> loadValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
- List<Validator> list = new LinkedList<Validator>();
- PreferencesWrapper pref = getPreferences(null);
- if (pref.nodeExists(PrefConstants.vals)){
- PreferencesWrapper vals = pref.node(PrefConstants.vals);
- for (String id : vals.childrenNames()){
- Validator base = baseValidators.get(id);
- Validator v = ValPrefManagerGlobal.loadValidator(id, vals, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Project);
- list.add(v);
- }
- }
- }
- return list;
- }
-
- /**
- * Answer the setting of the getOverride field.
- */
- public boolean getOverride(){
- PreferencesWrapper pref = getPreferences(null);
-
- if (!pref.nodeExists())return ProjectPreferences.DefaultOverride;
-
- int version = pref.getInt(PrefConstants.frameworkVersion, 0);
- if (version == 0){
- try {
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(_project);
- return pc.getDoesProjectOverride();
- }
- catch (InvocationTargetException e){
- // eat it, if it fails we just go with the defaults
- }
- }
- return pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride);
- }
-
- private ProjectPreferences migrateFromBeforeWTP30(IProject project, Map<String, Validator> baseValidators) {
- try {
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(project);
-
- List<Validator> list = migrateFromBeforeWTP30(baseValidators, pc);
- Validator[] vals = new Validator[list.size()];
- list.toArray(vals);
- return new ProjectPreferences(project, pc.getDoesProjectOverride(), pc.isDisableAllValidation(), vals);
- }
- catch (InvocationTargetException e){
- // eat it, if it fails we just go with the defaults
- }
- return new ProjectPreferences(project);
- }
-
- private List<Validator> migrateFromBeforeWTP30(Map<String, Validator> baseValidators, ProjectConfiguration pc)
- throws InvocationTargetException {
-
- Set<String> build = pc.getEnabledBuildlValidators();
- Set<String> manual = pc.getEnabledManualValidators();
-
- List<Validator> list = new LinkedList<Validator>();
- for (Validator v : baseValidators.values()){
- V2 v2 = v.asV2Validator();
- if (v2 != null){
- boolean isBuild = build == null || build.contains(v2.getValidatorClassname());
- boolean isManual = manual == null || manual.contains(v2.getValidatorClassname());
- if ((v.isBuildValidation() != isBuild) || (v.isManualValidation() != isManual)){
- V2 copy = v2.copy().asV2Validator();
- copy.setBuildValidation(isBuild);
- copy.setManualValidation(isManual);
- copy.setLevel(Validator.Level.Project);
- Friend.setMigrated(copy, true);
- list.add(copy);
- }
- }
- }
- return list;
- }
-
-
- /**
- * Answer the project preferences from the preference store.
- * @return null if the project does not have any specific preferences.
- */
- public ProjectPreferences loadProjectPreferences(IProject project, Map<String, Validator> baseValidators)
- throws BackingStoreException {
-
- PreferencesWrapper pref = getPreferences(null);
-
- if (pref == null)return null;
- int version = pref.getInt(PrefConstants.frameworkVersion, 0);
- if (version == 0){
- // This means that we have a project that is before WTP 3.0
- return migrateFromBeforeWTP30(project, baseValidators);
- }
-
- if (version != ValPrefManagerGlobal.frameworkVersion)ValPrefManagerGlobal.migrate(version, pref);
-
- if (!pref.nodeExists(PrefConstants.vals)){
- return new ProjectPreferences(project, pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride),
- pref.getBoolean(PrefConstants.suspend, ProjectPreferences.DefaultSuspend), new Validator[0]);
- }
-
- PreferencesWrapper vp = pref.node(PrefConstants.vals);
- List<Validator> list = new LinkedList<Validator>();
- for (String id : vp.childrenNames()){
- Validator base = baseValidators.get(id);
- Validator v = ValPrefManagerGlobal.loadValidator(id, vp, base);
- if (v != null){
- V2 v2 = v.asV2Validator();
- if (v2 != null)v2.setLevel(Validator.Level.Project);
- list.add(v);
- }
- }
- Validator[] vals = new Validator[list.size()];
- list.toArray(vals);
- return new ProjectPreferences(project, pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride),
- pref.getBoolean(PrefConstants.suspend, ProjectPreferences.DefaultSuspend), vals);
- }
-
- private PreferencesWrapper getPreferences(Boolean persist) {
- return PreferencesWrapper.getPreferences(_project, persist);
- }
-
- public void savePreferences(ProjectPreferences projectPreferences) {
- Validator[] validators = projectPreferences.getValidators();
- PreferencesWrapper pref = getPreferences(null);
- pref.putBoolean(PrefConstants.suspend, projectPreferences.getSuspend());
- pref.putBoolean(PrefConstants.override, projectPreferences.getOverride());
- pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- PreferencesWrapper vals = pref.node(PrefConstants.vals);
- try {
- Validator[] workspaceVals = ValManager.getDefault().getValidators();
- Map<String, Validator> base = new HashMap<String, Validator>(workspaceVals.length);
- for (Validator v : workspaceVals)base.put(v.getId(), v);
- for (Validator v : validators)ValPrefManagerGlobal.save(v, vals, base);
- pref.flush();
- ProjectConfiguration pc = ConfigurationManager.getManager()
- .getProjectConfiguration(projectPreferences.getProject());
- pc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
- pc.setEnabledManualValidators(getEnabledManualValidators(validators));
- pc.passivate();
- pc.store();
- updateListeners(_project);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public void savePreferences(ProjectPreferences projectPreferences, ValidatorMutable[] validators) {
- PreferencesWrapper pref = getPreferences(null);
- pref.putBoolean(PrefConstants.suspend, projectPreferences.getSuspend());
- pref.putBoolean(PrefConstants.override, projectPreferences.getOverride());
- pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- try {
- savePreferences(validators, false, null);
- pref.flush();
- updateListeners(_project);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public void savePreferences(MutableProjectSettings settings, Boolean persist){
- IProject project = settings.getProject();
- PreferencesWrapper pref = PreferencesWrapper.getPreferences(project, persist);
- pref.putBoolean(PrefConstants.suspend, settings.getSuspend());
- pref.putBoolean(PrefConstants.override, settings.getOverride());
- pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
-
- IMutableValidator[] vms = settings.getValidators();
- ValidatorMutable[] validators = new ValidatorMutable[vms.length];
- for (int i=0; i<vms.length;i++)validators[i] = (ValidatorMutable)vms[i];
-
- try {
- savePreferences(validators, false, persist);
- pref.flush();
- updateListeners(project);
- }
- catch (Exception e){
- if (project.isAccessible())ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- public void savePreferences(ValidatorMutable[] validators, boolean flush, Boolean persist){
- PreferencesWrapper pref = getPreferences(persist);
- pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
- PreferencesWrapper vals = pref.node(PrefConstants.vals);
- try {
- Validator[] workspaceVals = ValManager.getDefault().getValidators();
- Map<String, Validator> base = new HashMap<String, Validator>(workspaceVals.length);
- for (Validator v : workspaceVals)base.put(v.getId(), v);
- for (ValidatorMutable v : validators)ValPrefManagerGlobal.save(v, vals, base);
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(_project);
- pc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
- pc.setEnabledManualValidators(getEnabledManualValidators(validators));
- pc.passivate();
- pc.store();
- if (flush){
- pref.flush();
- updateListeners(_project);
- }
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- }
-
- }
-
- /**
- * Answer all the V1 validators that are enabled for build.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledBuildValidators(Validator[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (Validator v : validators){
- if (v.isBuildValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null)set.add(v1.getVmd());
- }
- }
- return set;
- }
-
- /**
- * Answer all the V1 validators that are enabled for build.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledBuildValidators(ValidatorMutable[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (ValidatorMutable v : validators){
- if (v.isBuildValidation() && v.isV1Validator())set.add(v.getVmd());
- }
- return set;
- }
-
- /**
- * Answer all the V1 validators that are enabled for manual validation.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledManualValidators(Validator[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (Validator v : validators){
- if (v.isManualValidation()){
- Validator.V1 v1 = v.asV1Validator();
- if (v1 != null)set.add(v1.getVmd());
- }
- }
- return set;
- }
-
- /**
- * Answer all the V1 validators that are enabled for manual validation.
- * @return
- */
- private Set<ValidatorMetaData> getEnabledManualValidators(ValidatorMutable[] validators) {
- Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
- for (ValidatorMutable v : validators){
- if (v.isManualValidation() && v.isV1Validator())set.add(v.getVmd());
- }
- return set;
- }
-
- public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
- try {
- ValPrefManagerGlobal.loadMessageSettings(validator, settings, getPreferences(null));
- }
- catch (BackingStoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
deleted file mode 100644
index fd001dc..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
+++ /dev/null
@@ -1,53 +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.internal;
-
-import java.util.BitSet;
-
-/**
- * A resource session property, that is used to improve the performance of the validation framework. This is placed
- * on each resource and it enables the framework to quickly determine if the resource needs to be processed.
- * @author karasiuk
- *
- */
-public class ValProperty {
-/*
- * I did some performance measurements on the IResource#setSessionProperty() and IResource#getSessionProperty()
- * methods, and they were very fast. I used a very large workspace (over 17,000) resources, and you could set (or get)
- * a property on all the resources in under 100ms.
- */
-
- private int _configNumber;
- private BitSet _configSet = new BitSet(100);
-
- private int _validationNumber;
- private BitSet _validationSet = new BitSet(100);
-
- public int getConfigNumber() {
- return _configNumber;
- }
- public void setConfigNumber(int configNumber) {
- _configNumber = configNumber;
- }
- public BitSet getConfigSet() {
- return _configSet;
- }
- public int getValidationNumber() {
- return _validationNumber;
- }
- public void setValidationNumber(int validationNumber) {
- _validationNumber = validationNumber;
- }
- public BitSet getValidationSet() {
- return _validationSet;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
deleted file mode 100644
index 8a97136..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * Type of validation. Build or Manual?
- * @author karasiuk
- *
- */
-public enum ValType {
- /** The validation is triggered via a resource change and the build process. */
- Build,
-
- /** The user manually requested the validation. */
- Manual,
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
deleted file mode 100644
index 9e91217..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-/**
- * An immutable object that holds a summary of the validation.
- * @author karasiuk
- *
- */
-public final class ValidationResultSummary {
-
- private final int _error;
- private final int _warning;
- private final int _info;
-
- public ValidationResultSummary(int error, int warning, int info){
- _error = error;
- _warning = warning;
- _info = info;
- }
-
- public int getSeverityError() {
- return _error;
- }
-
- public int getSeverityWarning() {
- return _warning;
- }
-
- public int getSeverityInfo() {
- return _info;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
deleted file mode 100644
index 01bf297..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-
-/**
- * Run the validators on a selected set of resources.
- * <p>
- * This is used to run manual validations (i.e. the user selects the Validate menu item),
- * or it is invoked programmatically by a third party through the ValidationFramework API.
- * It is not used for the build based invocation.
- * </p>
- * @author karasiuk
- *
- */
-public final class ValidationRunner implements IWorkspaceRunnable {
-
- private Map<IProject, Set<IResource>> _projects;
- private ValType _valType;
- private ValOperation _valOperation;
-
- /**
- * 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 valType
- * The type of validation that has been requested.
- *
- * @param monitor
- * Progress monitor.
- *
- * @param atomic
- * Run as an atomic workspace operation?
- */
- public static ValOperation validate(Map<IProject, Set<IResource>> projects, ValType valType,
- IProgressMonitor monitor, boolean atomic) throws CoreException{
- ValidationRunner me = new ValidationRunner(projects, valType);
- if (atomic)ResourcesPlugin.getWorkspace().run(me, null, IWorkspace.AVOID_UPDATE, monitor);
- else me.execute(monitor);
- return me._valOperation;
- }
-
- /**
- * Validate the selected file. This is a convenience method, it simply calls the more flexible
- * validate with Map method.
- *
- * @param file
- * The file to be validated.
- *
- * @param valType
- * The type of validation that has been requested.
- *
- * @param monitor
- * Progress monitor.
- *
- * @param atomic
- * Run as an atomic workspace operation?
- */
- public static ValOperation validate(IFile file, ValType valType, IProgressMonitor monitor, boolean atomic) throws CoreException{
- final Map<IProject, Set<IResource>> map = new HashMap<IProject, Set<IResource>>(1);
-
- Set<IResource> set = new HashSet<IResource>(1);
- set.add(file);
- map.put(file.getProject(), set);
- return validate(map, valType, monitor, atomic);
- }
-
- private ValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType){
- _projects = projects;
- _valType = valType;
-
- }
-
- private ValOperation execute(IProgressMonitor monitor){
- _valOperation = new ValOperation();
- ValManager manager = ValManager.getDefault();
-
- IValidatorVisitor startingVisitor = new IValidatorVisitor(){
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
- validator.validationStarting(project, operation.getState(), monitor);
- }
- };
-
- IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
- };
-
- manager.accept(startingVisitor, null, _valType, _valOperation, monitor);
-
- for (Map.Entry<IProject, Set<IResource>> me : _projects.entrySet()){
- if (monitor.isCanceled()){
- _valOperation.setCanceled(true);
- return _valOperation;
- }
- IProject project = me.getKey();
- manager.accept(startingVisitor, project, _valType, _valOperation, monitor);
- for (IResource resource : me.getValue()){
- try {
- manager.validate(project, resource, IResourceDelta.NO_CHANGE, _valType,
- IncrementalProjectBuilder.AUTO_BUILD, _valOperation, monitor);
- }
- catch (ResourceUnavailableError error){
- // if the resource is no longer available, we can't validate it, so we should just move on.
- }
- }
- manager.accept(finishedVisitor, project, _valType, _valOperation, monitor);
- }
- manager.accept(finishedVisitor, null, _valType, _valOperation, monitor);
- return _valOperation;
- }
-
- public void run(IProgressMonitor monitor) throws CoreException {
- execute(monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
deleted file mode 100644
index c897cfc..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Process the validator (version 2) extension point.
- *
- * @author karasiuk
- *
- */
-public class ValidatorExtensionReader {
-
- private static ValidatorExtensionReader _me = new ValidatorExtensionReader();
-
- public static ValidatorExtensionReader getDefault(){
- return _me;
- }
-
- private ValidatorExtensionReader(){}
-
- /**
- * Process the v2 extensions, returning all the v2 validators.
- */
- Collection<Validator> process() {
- Map<String,Validator> map = new HashMap<String, Validator>(100);
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return map.values();
-
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- String id = ext.getUniqueIdentifier();
- if (Tracing.isEnabled(id)){
- Validator v = processValidator(validator, id, ext.getLabel(), null);
- if (v != null)map.put(v.getId(),v);
- }
- }
- }
-
- extensionPoint = getExtensionPointExclude();
- if (extensionPoint != null){
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- String id = validator.getAttribute(ExtensionConstants.Exclude.id);
- Validator v = map.get(id);
- V2 v2 = null;
- if (v != null)v2 = v.asV2Validator();
-
- if (v2 == null){
- String msg = NLS.bind("Plug-in configuration error, extension {0} references validator id {1} but this id does not exist.", //$NON-NLS-1$
- extensionPoint.getUniqueIdentifier(), id);
- CoreException ex = new CoreException(new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg));
- ValidationPlugin.getPlugin().handleException(ex);
- }
- else {
- for (IConfigurationElement exclude : validator.getChildren()){
- FilterGroup fg = null;
- try {
- fg = createFilterGroup(exclude);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- IContributor contrib = validator.getContributor();
- String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- }
- if (fg != null && fg.isExclude()){
- mergeExcludeGroup(v2, fg);
- }
- }
- }
- }
- }
-
- }
- return map.values();
-
- }
-
- /**
- * Merge the rules from the filter group into the current exclude group, creating a current exclude
- * group if need be.
- * @param v2
- * @param fg
- */
- private void mergeExcludeGroup(V2 v2, FilterGroup fg){
- FilterGroup existing = null;
- for (FilterGroup group : v2.getGroups()){
- if (group.isExclude()){
- existing = group;
- break;
- }
- }
- if (existing == null)v2.add(fg);
- else {
- List<FilterRule> rules = new LinkedList<FilterRule>();
- for (FilterRule rule : existing.getRules())rules.add(rule);
-
- for (FilterRule rule : fg.getRules())rules.add(rule);
-
- FilterRule[] filterRules = new FilterRule[rules.size()];
- rules.toArray(filterRules);
- FilterGroup merged = FilterGroup.create(existing.isExclude(), filterRules);
-
- v2.replaceFilterGroup(existing, merged);
- }
- }
-
- /**
- * Process the validator element in a validator extension.
- *
- * @param validator
- * The validator element.
- *
- * @param deep
- * If true load all the configuration elements for each
- * validator, if false do a shallow load, where only the
- * validator class, id and name's are loaded.
- *
- * @param project
- * The project that you are defined in. This can be null which
- * means that you are a global validator.
- *
- * @return a configured validator or null if there was an error.
- */
- private Validator processValidator(IConfigurationElement validator, String id, String label, IProject project) {
- Validator.V2 v = null;
- try {
- v = Validator.create(validator, project).asV2Validator();
- v.setLevel(Validator.Level.Extension);
- v.setId(id);
- v.setName(label);
- v.setBuildValidation(getAttribute(validator, ExtensionConstants.build, true));
- v.setManualValidation(getAttribute(validator, ExtensionConstants.manual, true));
- v.setMarkerId(validator.getAttribute(ExtensionConstants.markerId));
- v.setVersion(getAttribute(validator, ExtensionConstants.version, 1));
- v.setSourceId(validator.getAttribute(ExtensionConstants.sourceId));
- IConfigurationElement[] children = validator.getChildren();
- for (IConfigurationElement child : children)processIncludeAndExcludeElement(v, child);
- }
- catch (Exception e){
- ValidationPlugin.getPlugin().handleException(e);
- IContributor contrib = validator.getContributor();
- String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
- ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
- }
- return v;
- }
-
- /**
- * Answer all the messages that this validator has defined.
- * @param v
- * @return an empty list if the validator did not define any messages.
- */
- public List<MessageSeveritySetting> addMessages(Validator v){
- List<MessageSeveritySetting> list = new LinkedList<MessageSeveritySetting>();
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return list;
- IExtension ext = extensionPoint.getExtension(v.getId());
- if (ext == null)return list;
-
- for (IConfigurationElement elem : ext.getConfigurationElements()){
- for (IConfigurationElement ce : elem.getChildren(ExtensionConstants.MessageCategory.name)){
- list.add(processMessage(ce));
- }
- }
-
- return list;
- }
-
- /**
- * Answer the extension point for the v2 validators.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.validator);
- }
-
- /**
- * Answer the extension point for adding exclusion filters. This is where another validator can
- * further restrict an existing validator.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPointExclude() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.excludeExtension);
- }
-
- /**
- * Process a message element for the validator, by creating a MessageCategory for it.
- *
- * @param ce a MessageCategory element.
- */
- private MessageSeveritySetting processMessage(IConfigurationElement ce) {
- String s = ce.getAttribute(ExtensionConstants.MessageCategory.severity);
- MessageSeveritySetting.Severity sev = null;
- if (ExtensionConstants.MessageCategory.sevError.equals(s))sev = MessageSeveritySetting.Severity.Error;
- else if (ExtensionConstants.MessageCategory.sevWarning.equals(s))sev = MessageSeveritySetting.Severity.Warning;
- else if (ExtensionConstants.MessageCategory.sevIgnore.equals(s))sev = MessageSeveritySetting.Severity.Ignore;
-
- return new MessageSeveritySetting(ce.getAttribute(ExtensionConstants.MessageCategory.id),
- ce.getAttribute(ExtensionConstants.MessageCategory.label), sev);
- }
-
- /**
- * Process the include and exclude elements.
- *
- * @param v The validator that we are building up.
- * @param group The children of the validator tag. This may included include and exclude elements.
- * Other elements are ignored.
- */
- private void processIncludeAndExcludeElement(Validator.V2 v, IConfigurationElement group) {
- FilterGroup fg = createFilterGroup(group);
- if (fg != null)v.add(fg);
- }
-
- /**
- * Process an include or exclude element, returning a filter group for it.
- *
- * @param group
- * An include, exclude or some other element. Only include and
- * exclude elements are processed, other types are ignored.
- *
- * @return a filter group that corresponds to the include or exclude
- * element, or null if the element was not an include or exclude
- * element.
- */
- private FilterGroup createFilterGroup(IConfigurationElement group){
- String name = group.getName();
- if (!FilterGroup.isKnownName(name))return null;
-
-
- IConfigurationElement[] rules = group.getChildren(ExtensionConstants.rules);
- // there should only be one
- List<FilterRule> list = new LinkedList<FilterRule>();
- for (int i=0; i<rules.length; i++){
- IConfigurationElement[] r = rules[i].getChildren();
- for(int j=0; j<r.length; j++){
- list.add(processRule(r[j]));
- }
- }
- FilterRule[] filterRules = new FilterRule[list.size()];
- list.toArray(filterRules);
- return FilterGroup.create(name, filterRules);
- }
-
- /**
- * Process a rule in one of the rule groups.
- *
- * @param rule a rule in the group, like fileext.
- */
- private FilterRule processRule(IConfigurationElement rule) {
- FilterRule fr = FilterRule.create(rule);
- if (fr == null){
- String contributor = ""; //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- try {
- contributor = rule.getDeclaringExtension().getContributor().getName();
- name = rule.getName();
- }
- catch (Exception e){
- // eat it
- }
- throw new IllegalStateException(ValMessages.ErrFilterRule + " : " + //$NON-NLS-1$
- contributor + " : " + name); //$NON-NLS-1$
- }
- return fr;
- }
-
- /**
- * Determine if any of the validators need to be migrated, and if so answer a new
- * Validator array.
- *
- * @param validators the existing validators (from the preferences).
- *
- * @return null if no validators needed to be migrated.
- */
- Validator[] migrate(Validator[] validators, IProject project) {
- int count = 0;
- Map<String, Validator> map = new HashMap<String, Validator>(validators.length);
- for (Validator v : validators)map.put(v.getId(), v);
-
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint == null)return null;
-
- for (IExtension ext : extensionPoint.getExtensions()){
- for (IConfigurationElement validator : ext.getConfigurationElements()){
- Validator v = processValidator(validator, ext.getUniqueIdentifier(), ext.getLabel(), project);
- if (v == null)continue;
- Validator old = map.get(v.getId());
- if (old == null || old.getVersion() < v.getVersion()){
- //TODO we may be replacing user preferences, at some point we may want to do a real migration.
- map.put(v.getId(), v);
- count++;
- }
- }
- }
-
- if (count > 0){
- Validator[] vals = new Validator[map.size()];
- map.values().toArray(vals);
- return vals;
- }
- return null;
- }
-
- private boolean getAttribute(IConfigurationElement element, String name, boolean dft){
- String v = element.getAttribute(name);
- if (v == null)return dft;
- if ("true".equalsIgnoreCase(v))return true; //$NON-NLS-1$
- if ("false".equalsIgnoreCase(v))return false; //$NON-NLS-1$
- return dft;
- }
-
- private int getAttribute(IConfigurationElement element, String name, int dft){
- String v = element.getAttribute(name);
- if (v == null)return dft;
- try {
- return Integer.parseInt(v);
- }
- catch (Exception e){
- // eat it.
- }
- return dft;
- }
-
-// /**
-// * This method is only used for debugging.
-// * @param elem
-// */
-// private static void dump(IConfigurationElement elem){
-// String name = elem.getName();
-// String[] attribs = elem.getAttributeNames();
-// String[] vals = new String[attribs.length];
-// for (int i=0; i<vals.length; i++)vals[i] = elem.getAttribute(attribs[i]);
-// String v = elem.getValue();
-// IConfigurationElement[] children = elem.getChildren();
-// for (int i=0; i<children.length; i++)dump(children[i]);
-// }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
deleted file mode 100644
index 62543f7..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
+++ /dev/null
@@ -1,140 +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.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.IValidatorGroupListener;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Process the validator group (for use with validator version 2 only) extension point.
- *
- * @author nitin
- *
- */
-public class ValidatorGroupExtensionReader {
-
- private static final String DOT = "."; //$NON-NLS-1$
- private static ValidatorGroupExtensionReader _instance;
-
- public static ValidatorGroupExtensionReader getDefault() {
- if (_instance == null)_instance = new ValidatorGroupExtensionReader();
- return _instance;
- }
-
- /**
- * Map of group IDs to configuration elements
- */
- private Map<String, List<IConfigurationElement>> _map;
-
- /**
- * Map of group ID's to resolved configuration elements.
- */
- private Map<String, IValidatorGroupListener[]> _resolved;
-
- private ValidatorGroupExtensionReader() {
- init();
- }
-
- /**
- * Answer the listeners with this group id.
- * @param groupID
- * @return an empty array there are no listeners for this group id.
- */
- IValidatorGroupListener[] createListeners(String groupID) throws CoreException {
- IValidatorGroupListener[] result = _resolved.get(groupID);
- if (result != null)return result;
-
- List<IConfigurationElement> elements = _map.get(groupID);
- if (elements == null){
- _resolved.put(groupID, new IValidatorGroupListener[0]);
- String msg = NLS.bind("Configuration error, there is no validation listener group with id: {0}", groupID); //$NON-NLS-1$
- Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
- throw new CoreException(status);
- }
-
- List<IValidatorGroupListener> listeners = new ArrayList<IValidatorGroupListener>(elements.size());
- for (IConfigurationElement element : elements) {
- IValidatorGroupListener listener;
- try {
- listener = (IValidatorGroupListener) element.createExecutableExtension(ExtensionConstants.Group.attClass);
- listeners.add(listener);
- }
- catch (Exception e) {
- ValidationPlugin.getPlugin().handleException(e);
- listeners = new ArrayList<IValidatorGroupListener>();
- }
- }
-
- result = listeners.toArray(new IValidatorGroupListener[listeners.size()]);
- _resolved.put(groupID, result);
- return result;
- }
-
- /**
- * Answer the extension point for the validatorGroups.
- *
- * @return null if there is a problem or no extensions.
- */
- private IExtensionPoint getExtensionPoint() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.group);
- }
-
- private void init() {
- _map = new HashMap<String, List<IConfigurationElement>>(4);
- _resolved = new HashMap<String, IValidatorGroupListener[]>(4);
-
- IExtensionPoint extensionPoint = getExtensionPoint();
- if (extensionPoint != null) {
- for (IExtension ext : extensionPoint.getExtensions()) {
- for (IConfigurationElement group : ext.getConfigurationElements()) {
- processGroupElement(group);
- }
- }
- }
- }
-
- private void processGroupElement(IConfigurationElement element) {
- if (!ExtensionConstants.Group.elementGroup.equals(element.getName()))return;
-
- String id = element.getAttribute(ExtensionConstants.Group.attId);
- if (id == null)throw new IllegalStateException("Configuration error, the " + //$NON-NLS-1$
- ExtensionConstants.Group.attId + " is required"); //$NON-NLS-1$
- // force the use of a qualified ID
- if (id.indexOf(DOT) < 0) {
- id = element.getContributor().getName() + DOT + id;
- }
- IConfigurationElement[] newElements = element.getChildren(ExtensionConstants.Group.elementListener);
- if (newElements.length > 0) {
- List<IConfigurationElement> elements = _map.get(id);
- if (elements == null) {
- elements = new ArrayList<IConfigurationElement>();
- _map.put(id, elements);
- }
- elements.addAll(Arrays.asList(newElements));
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java
deleted file mode 100644
index d18b0c5..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.eclipse.wst.validation.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.Validator.V1;
-import org.eclipse.wst.validation.Validator.V2;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-
-/**
- * The mutable fields that a user can change through the preference or property page.
- * @author karasiuk
- *
- */
-public final class ValidatorMutable implements IAdaptable, IMutableValidator {
-
- private boolean _build;
- private boolean _manual;
- private String _delegatingId;
-
- private int _changeCountGroups;
- private int _changeCountMessages;
-
- private final String _name;
- private final String _sourceId;
- private final boolean _isV1;
- private final boolean _isV2;
- private final ValidatorMetaData _vmd;
- private final String _id;
- private final int _version;
-
- private FilterGroup[] _groups;
- private final Map<String, MessageSeveritySetting> _messageSettings;
- private final String _validatorClassname;
-
- private final boolean _origBuild;
- private final boolean _origManual;
- private final String _origDelegating;
-
- public ValidatorMutable(Validator validator) {
- _name = validator.getName();
- _sourceId = validator.getSourceId();
- _manual = validator.isManualValidation();
- _build = validator.isBuildValidation();
- V2 v2 = validator.asV2Validator();
- _isV2 = v2 != null;
- _delegatingId = validator.getDelegatingId();
-
- V1 v1 = validator.asV1Validator();
- _isV1 = v1 != null;
- _vmd = _isV1 ? v1.getVmd() : null;
- _id = validator.getId();
-
- _origBuild = _build;
- _origDelegating = _delegatingId;
- _origManual = _manual;
- _version = validator.getVersion();
- _validatorClassname = validator.getValidatorClassname();
- _messageSettings = new HashMap<String, MessageSeveritySetting>(10);
- for (Map.Entry<String, MessageSeveritySetting> me : validator.getMessageSettings().entrySet()){
- _messageSettings.put(me.getKey(), me.getValue().copy());
- }
-
- if (v2 != null){
- FilterGroup[] groups = v2.getGroups();
- _groups = new FilterGroup[groups.length];
- System.arraycopy(groups, 0, _groups, 0, groups.length);
- }
- }
-
- public ValidatorMutable(ValidatorMutable val) {
- _build = val._build;
- _delegatingId = val._delegatingId;
- FilterGroup[] groups = val.getGroups();
- _groups = new FilterGroup[groups.length];
- System.arraycopy(groups, 0, _groups, 0, groups.length);
-
- _id = val._id;
- _isV1 = val._isV1;
- _isV2 = val._isV2;
- _manual = val._manual;
- _messageSettings = new HashMap<String, MessageSeveritySetting>(10);
- for (Map.Entry<String, MessageSeveritySetting> me : val.getMessageSettings().entrySet()){
- _messageSettings.put(me.getKey(), me.getValue().copy());
- }
-
- _name = val._name;
- _origBuild = val._origBuild;
- _origDelegating = val._origDelegating;
- _origManual = val._origManual;
- _sourceId = val._sourceId;
- _validatorClassname = val._validatorClassname;
- _version = val._version;
- _vmd = val._vmd;
- }
-
- public void setBuildValidation(boolean build) {
- _build = build;
- }
-
- public void setManualValidation(boolean manual) {
- _manual = manual;
- }
-
- public String getName() {
- return _name;
- }
-
- public boolean isManualValidation() {
- return _manual;
- }
-
- public boolean isBuildValidation() {
- return _build;
- }
-
- public boolean isV2Validator() {
- return _isV2;
- }
-
- public String getDelegatingId() {
- return _delegatingId;
- }
-
- /**
- * The caller of this method must not change the ValidatorMetaData.
- */
- public ValidatorMetaData getVmd() {
- return _vmd;
- }
-
- public boolean isV1Validator() {
- return _isV1;
- }
-
- public String getId() {
- return _id;
- }
-
- /**
- * Answer true if any of your settings have changed.
- */
- public boolean isChanged() {
- if (hasGlobalChanges())return true;
- if (_changeCountGroups > 0 || _changeCountMessages > 0)return true;
- return false;
- }
-
- public boolean hasGlobalChanges() {
- if (_origBuild != _build)return true;
- if (_origManual != _manual)return true;
- if (!Misc.same(_origDelegating, _delegatingId))return true;
- return false;
- }
-
- public int getVersion() {
- return _version;
- }
-
- public void replaceFilterGroup(FilterGroup existing, FilterGroup merged) {
- int i = find(existing);
- if (i == -1)add(merged); // this should never happen
- else {
- _groups[i] = merged;
- bumpChangeCountGroups();
- }
- }
-
- public void remove(FilterGroup group) {
- int i = find(group);
- if (i == -1)return;
-
- FilterGroup[] groups = new FilterGroup[_groups.length-1];
- if (i > 0)System.arraycopy(_groups, 0, groups, 0, i);
- if (i < groups.length)System.arraycopy(_groups, i+1, groups, i, groups.length-i);
- _groups = groups;
- bumpChangeCountGroups();
- }
-
- private int find(FilterGroup group) {
- for (int i=0; i<_groups.length; i++)if (group == _groups[i])return i;
- return -1;
- }
-
- public void add(FilterGroup fg) {
- assert fg != null;
- FilterGroup[] groups = new FilterGroup[_groups.length+1];
- System.arraycopy(_groups, 0, groups, 0, _groups.length);
- groups[_groups.length] = fg;
- _groups = groups;
- bumpChangeCountGroups();
- }
-
- private void bumpChangeCountGroups(){
- _changeCountGroups++;
- }
-
- public int getChangeCountGroups() {
- return _changeCountGroups;
- }
-
- public FilterGroup[] getGroups(){
- return _groups;
- }
-
- public void setDelegatingId(String id) {
- _delegatingId = id;
- }
-
- public Map<String, MessageSeveritySetting> getMessageSettings() {
- return _messageSettings;
- }
-
- public void bumpChangeCountMessages(){
- _changeCountMessages++;
- }
-
- public String getValidatorClassname() {
- return _validatorClassname;
- }
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public boolean sameConfig(Validator validator) {
- if (validator == null)return false;
- return hashCodeForConfig() == validator.hashCodeForConfig();
- }
-
- private int hashCodeForConfig() {
- int h = 0;
- if (_build)h += 101;
- if (_delegatingId != null)h += _delegatingId.hashCode();
- if (_manual)h += 201;
- if (_messageSettings != null){
- for (MessageSeveritySetting ms : _messageSettings.values())h += ms.hashCode();
- }
- if (_sourceId != null)h += _sourceId.hashCode();
- h += _version;
- if (_id != null)h += _id.hashCode();
- for (FilterGroup fg : _groups)h += fg.hashCodeForConfig();
- return h;
- }
-
- @Override
- public String toString() {
- return _name;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
deleted file mode 100644
index 6d20dd5..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
+++ /dev/null
@@ -1,253 +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.internal.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.Deserializer;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.Serializer;
-import org.eclipse.wst.validation.internal.ValMessages;
-
-/**
- * An immutable group of filter rules.
- * @author karasiuk
- *
- */
-public abstract class FilterGroup implements IAdaptable {
-
- private final FilterRule[] _rules;
-
- /** The version number of the serialization (in case we ever need to change this) */
- private static final int SerializationVersion = 1;
-
- /**
- * Answer a filter group based on the type of the group.
- *
- * @param name either "include" or "exclude"
- *
- * @return null if the name parameter isn't correct.
- */
- public static FilterGroup create(String name, FilterRule[] rules) {
- if (ExtensionConstants.include.equals(name))return new FilterIncludeGroup(rules);
- if (ExtensionConstants.exclude.equals(name))return new FilterExcludeGroup(rules);
- return null;
- }
-
- /**
- * Answer a filter group from a deserializer.
- * @param des
- *
- * @see FilterGroup#save(Serializer)
- */
- public static FilterGroup create(Deserializer des){
- des.getInt(); // get the version
- String type = des.getString();
-
- int numberRules = des.getInt();
- List<FilterRule> list = new LinkedList<FilterRule>();
- for (int i=0; i<numberRules; i++)list.add(FilterRule.create(des));
- FilterRule[] rules = new FilterRule[list.size()];
- list.toArray(rules);
-
- return create(type, rules);
- }
-
- /**
- * Answer a new filter group.
- *
- * @param exclude if true an exclusion group is returned, otherwise an inclusion group is returned.
- */
- public static FilterGroup create(boolean exclude, FilterRule[] rules){
- if (exclude) return new FilterExcludeGroup(rules);
- return new FilterIncludeGroup(rules);
- }
-
- /**
- * Answer true if this is a supported type of group.
- * @param name Type of group that is being tested.
- * @return
- */
- public static boolean isKnownName(String name) {
- if (ExtensionConstants.include.equals(name))return true;
- if (ExtensionConstants.exclude.equals(name))return true;
- return false;
- }
-
-
- private FilterGroup(FilterRule[] rules){
- _rules = rules;
- }
-
- /**
- * The rules in the group.
- */
- public final FilterRule[] getRules(){
- FilterRule[] rules = new FilterRule[_rules.length];
- System.arraycopy(_rules, 0, rules, 0, _rules.length);
- return rules;
- }
-
- /**
- * Answer the internal type of group, e.g. "include" or "exclude".
- */
- public abstract String getType();
-
- /** Answer the type as a type that can be displayed to a user, that is it has been localized. */
- public abstract String getDisplayableType();
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public static final class FilterIncludeGroup extends FilterGroup {
-
- private FilterIncludeGroup(FilterRule[] rules){
- super(rules);
- }
-
- public String getType() {
- return ExtensionConstants.include;
- }
-
- public String getDisplayableType() {
- return ValMessages.GroupInclude;
- }
-
- public boolean isInclude() {
- return true;
- }
-
- }
-
-
- public static final class FilterExcludeGroup extends FilterGroup {
-
- private FilterExcludeGroup(FilterRule[] rules){
- super(rules);
- }
- public String getType() {
- return ExtensionConstants.exclude;
- }
-
- public String getDisplayableType() {
- return ValMessages.GroupExclude;
- }
-
- public boolean isExclude() {
- return true;
- }
- }
-
- /**
- * Save your settings into the serializer.
- * @param ser
- */
- public void save(Serializer ser){
- ser.put(SerializationVersion);
- ser.put(getType());
- ser.put(_rules.length);
- for (FilterRule rule : _rules)rule.save(ser);
- }
-
- /**
- * Answer whether or not we should validate the resource based on the filters in this group.
- *
- * @param project the project that is being validated.
- * @param resource the resource that is being validated. This can be null, in which case
- * only the project level checks are performed.
- */
- public boolean shouldValidate(IProject project, IResource resource, ContentTypeWrapper contentTypeWrapper) {
- boolean exclude = isExclude();
- boolean include = isInclude();
- int count = 0;
- for (FilterRule rule : _rules){
- if (resource != null){
- Boolean match = rule.matchesResource(resource, contentTypeWrapper);
- if (match != null)count++;
- if (exclude && match != null && match)return false;
- if (include && match != null && match)return true;
- }
-
- Boolean match = rule.matchesProject(project);
- if (match != null)count++;
- if (exclude && match != null && match)return false;
- if (include && match != null && match)return true;
- }
- if (exclude)return true;
- if (count == 0)return true;
- return false;
- }
-
- /**
- * Answer true if this is an inclusion filter, that is at least one of the rules must
- * match in order to validate the resource.
- */
- public boolean isInclude() {
- return false;
- }
-
- /**
- * Answer true if this is an exclusion filter, that is if any of the rules match the
- * resource is not validated.
- */
- public boolean isExclude() {
- return false;
- }
-
- public int hashCodeForConfig() {
- int h = 0;
- if (isExclude())h += 13;
- for (FilterRule fr : _rules)h += fr.hashCodeForConfig();
- return h;
- }
-
- /**
- * Create a new group by adding a rule to an existing group.
- * @param baseGroup The group that holds the existing rules.
- * @param rule The new rule that is being added
- * @return
- */
- public static FilterGroup addRule(FilterGroup baseGroup, FilterRule rule) {
- List<FilterRule> list = new LinkedList<FilterRule>();
- for (FilterRule r : baseGroup._rules)list.add(r);
- list.add(rule);
-
- FilterRule[] rules = new FilterRule[list.size()];
- list.toArray(rules);
- return FilterGroup.create(baseGroup.isExclude(), rules);
- }
-
- /**
- * Create a new group by removing a rule from an existing group.
- * @param baseGroup The group that holds the existing rules.
- * @param rule The rule that is being removed
- * @return
- */
- public static FilterGroup removeRule(FilterGroup baseGroup, FilterRule rule) {
- List<FilterRule> list = new LinkedList<FilterRule>();
- for (FilterRule r : baseGroup._rules){
- if (!r.equals(rule))list.add(r);
- }
-
- FilterRule[] rules = new FilterRule[list.size()];
- list.toArray(rules);
- return FilterGroup.create(baseGroup.isExclude(), rules);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
deleted file mode 100644
index 04cf0c2..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.validation.internal.ContentTypeWrapper;
-import org.eclipse.wst.validation.internal.Deserializer;
-import org.eclipse.wst.validation.internal.ExtensionConstants;
-import org.eclipse.wst.validation.internal.Serializer;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * A rule that is used to filter out (or in) validation on a resource.
- * The concrete classes are all immutable.
- * @author karasiuk
- *
- */
-public abstract class FilterRule implements IAdaptable {
-
- protected final String _pattern;
-
- protected static final String PortableFileDelim = "/"; //$NON-NLS-1$
-
- /**
- * Create a rule based on a configuration element.
- *
- * @param rule
- * The configuration element, see the extension point for details.
- * @return null if there is a problem.
- */
- public static FilterRule create(IConfigurationElement rule){
- String name = rule.getName();
- if (ExtensionConstants.Rule.fileext.equals(name))return new FileExt(rule);
- if (ExtensionConstants.Rule.projectNature.equals(name))return new ProjectNature(rule);
- if (ExtensionConstants.Rule.file.equals(name))return File.createFile(rule);
- if (ExtensionConstants.Rule.contentType.equals(name))return ContentType.createContentType(rule);
- if (ExtensionConstants.Rule.facet.equals(name))return new Facet(rule);
- if (ExtensionConstants.Rule.pattern.equals(name))return FilePattern.createFilePattern(rule);
- return null;
- }
-
- static FilterRule create(Deserializer des) {
- String type = des.getString();
- if (ExtensionConstants.Rule.fileext.equals(type)){
- String pattern = des.getString();
- boolean caseSensitive = des.getBoolean();
- return new FileExt(pattern, caseSensitive);
- }
-
- if (ExtensionConstants.Rule.projectNature.equals(type)){
- String pattern = des.getString();
- return new ProjectNature(pattern);
- }
-
- if (ExtensionConstants.Rule.file.equals(type)){
- String pattern = des.getString();
- boolean caseSensitive = des.getBoolean();
- int fileType = des.getInt();
- return new File(pattern, caseSensitive, fileType);
- }
-
- if (ExtensionConstants.Rule.contentType.equals(type)){
- String pattern = des.getString();
- boolean exactMatch = des.getBoolean();
- return new ContentType(pattern, exactMatch);
- }
-
- if (ExtensionConstants.Rule.facet.equals(type)){
- String pattern = des.getString();
- return new Facet(pattern, null);
- }
-
- if (ExtensionConstants.Rule.pattern.equals(type)){
- String pattern = des.getString();
- boolean caseSensitive = des.getBoolean();
- return new FilePattern(pattern, caseSensitive);
- }
- return null;
- }
-
-
- public static FilterRule createFile(String pattern, boolean caseSensitive, int type){
- return new File(pattern, caseSensitive, type);
- }
-
- public static FilterRule createFileExt(String pattern, boolean caseSensitive){
- FileExt ext = new FileExt(pattern, caseSensitive);
- return ext;
- }
-
- public static FilterRule createFacet(String facetId){
- return new Facet(facetId, null);
- }
-
- public static FilterRule createProject(String projectNature){
- return new ProjectNature(projectNature);
- }
-
- public static FilterRule createContentType(String contentType, boolean exactMatch){
- return new ContentType(contentType, exactMatch);
- }
-
- protected FilterRule(String pattern){
- _pattern = pattern;
- }
-
- /**
- * Answer true if the rule matches the resource, false if it doesn't, and
- * null if the rule does not apply to resources.
- *
- * @param resource the resource that is being validated.
- */
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper){
- return null;
- }
-
- /**
- * Answer true if the rule matches the project, false if it doesn't, and null if the
- * rule does not apply.
- *
- * @param project the project that is being validated.
- */
- public Boolean matchesProject(IProject project){
- return null;
- }
-
- public String toString() {
- return getDisplayableType() + ": " + _pattern; //$NON-NLS-1$
- }
-
- /** Answer a name of the rule, that can be displayed to a user. */
- public String getName(){
- return toString();
- }
-
- public String getPattern(){
- return _pattern;
- }
-
- /** Answer the type of rule. */
- public abstract String getType();
-
- /** Answer a type that can be displayed to an end user. */
- public abstract String getDisplayableType();
-
- public static boolean asBoolean(String value, boolean aDefault){
- if (value == null)return aDefault;
- if (value.equals(ExtensionConstants.True))return true;
- if (value.equals(ExtensionConstants.False))return false;
- return aDefault;
- }
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public static abstract class FilterRuleCaseSensitive extends FilterRule {
-
- public FilterRuleCaseSensitive(String pattern, boolean caseSensitive) {
- super(pattern);
- _caseSensitive = caseSensitive;
- }
-
- private final boolean _caseSensitive;
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_caseSensitive)h += 401;
- return h;
- }
-
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_caseSensitive);
- }
-
- public boolean isCaseSensitive() {
- return _caseSensitive;
- }
-
- }
-
- public static final class ProjectNature extends FilterRule {
-
- private ProjectNature(IConfigurationElement rule) {
- super(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
-
- }
-
- public ProjectNature(String projectNature) {
- super(projectNature);
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleProjectNature;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.projectNature;
- }
-
- public Boolean matchesProject(IProject project) {
- try {
- return project.hasNature(_pattern);
- }
- catch (CoreException e){
- }
- return Boolean.FALSE;
- }
-
- }
-
- public static final class FileExt extends FilterRuleCaseSensitive {
-
- private FileExt(IConfigurationElement rule){
- super(rule.getAttribute(ExtensionConstants.RuleAttrib.ext),
- asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false));
- }
-
- private FileExt(String pattern, boolean caseSensitive) {
- super(pattern, caseSensitive);
- }
-
- public String getType() {
- return ExtensionConstants.Rule.fileext;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleFileExt;
- }
-
- public String getName() {
- return toString();
- }
-
- public String toString() {
- if (isCaseSensitive())return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- String ext = resource.getFileExtension();
- if (isCaseSensitive())return _pattern.equals(ext);
- return _pattern.equalsIgnoreCase(ext);
- }
- }
-
- /**
- * A rule that is used to filter based on file or folder names.
- * @author karasiuk
- *
- */
- public static final class File extends FilterRuleCaseSensitive {
-
- private final String _patternAsLowercase;
-
- /** One of the FileTypeXX constants. */
- private final int _type;
-
- public static final int FileTypeFile = 1;
- public static final int FileTypeFolder = 2;
- public static final int FileTypeFull = 3;
-
- private static File createFile(IConfigurationElement rule){
- String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.name);
- if (pattern == null)throw new IllegalStateException(ValMessages.ErrPatternAttrib);
- String type = rule.getAttribute(ExtensionConstants.RuleAttrib.fileType);
- if (type == null)throw new IllegalStateException(ValMessages.ErrTypeReq);
-
- int myType = -1;
- if (ExtensionConstants.FileType.file.equals(type))myType = FileTypeFile;
- else if (ExtensionConstants.FileType.folder.equals(type)){
- myType = FileTypeFolder;
- if (!pattern.endsWith(PortableFileDelim))pattern += PortableFileDelim;
- }
- else if (ExtensionConstants.FileType.full.equals(type))myType = FileTypeFull;
- else {
- Object[] parms = {type, ExtensionConstants.FileType.file, ExtensionConstants.FileType.folder,
- ExtensionConstants.FileType.full};
- throw new IllegalStateException(NLS.bind(ValMessages.ErrType, parms));
- }
- boolean caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
- return new File(pattern, caseSensitive, myType);
- }
-
- private File(String pattern, boolean caseSensitive, int type){
- super(pattern, caseSensitive);
- _type = type;
- _patternAsLowercase = pattern == null ? null : pattern.toLowerCase();
- }
-
- public String getType() {
- return ExtensionConstants.Rule.file;
- }
-
- public String getDisplayableType() {
- if (_type == FileTypeFolder)return ValMessages.RuleFolder;
- if (_type == FileTypeFull)return ValMessages.RuleFull;
- return ValMessages.RuleFile;
- }
-
- public void setData(IConfigurationElement rule) {
- }
-
- public String toString() {
- if (isCaseSensitive())return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- String name = null;
- switch (_type){
- case FileTypeFile:
- name = resource.getName();
- break;
-
- case FileTypeFolder:
- name = resource.getProjectRelativePath().removeLastSegments(1).toString() + PortableFileDelim;
- break;
-
- case FileTypeFull:
- name = resource.getProjectRelativePath().toPortableString();
- break;
- }
-
- if (name == null)return Boolean.FALSE;
- if (isCaseSensitive())return name.startsWith(_pattern);
- return name.toLowerCase().startsWith(_patternAsLowercase);
- }
-
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_type);
- }
-
- }
-
- public static final class Facet extends FilterRule {
-
- private final String _versionExpression;
-
- private Facet(IConfigurationElement rule){
- super(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
- _versionExpression = rule.getAttribute(ExtensionConstants.RuleAttrib.version);
-
- }
-
- public Facet(String facetId, String versionExpression) {
- super(facetId);
- _versionExpression = versionExpression;
- }
-
- public String getType() {
- return ExtensionConstants.Rule.facet;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleFacet;
- }
-
- @Override
- public Boolean matchesProject(IProject project) {
- try {
- if (_versionExpression == null)return FacetedProjectFramework.hasProjectFacet(project, _pattern);
- return FacetedProjectFramework.hasProjectFacet(project, _pattern, _versionExpression);
- }
- catch (CoreException e){
- if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
- }
- return Boolean.FALSE;
- }
-
- @Override
- public String toString() {
- StringBuffer b = new StringBuffer(200);
- b.append(getDisplayableType());
- b.append(": "); //$NON-NLS-1$
- b.append(_pattern);
-
- if (_versionExpression != null){
- b.append(" ("); //$NON-NLS-1$
- b.append(_versionExpression);
- b.append(")"); //$NON-NLS-1$
- }
- return b.toString();
- }
-
- }
-
- public static final class ContentType extends FilterRule {
-
- private final IContentType _type;
- private final boolean _exactMatch;
-
- private ContentType(String pattern, boolean exactMatch){
- super(pattern);
- _type = Platform.getContentTypeManager().getContentType(pattern);
- _exactMatch = exactMatch;
- }
-
- private static ContentType createContentType(IConfigurationElement rule){
- String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.id);
- boolean exactMatch = true;
- String exact = rule.getAttribute(ExtensionConstants.RuleAttrib.exactMatch);
- if (ExtensionConstants.False.equals(exact)) exactMatch = false;
-
- return new ContentType(pattern, exactMatch);
- }
-
- public String getType() {
- return ExtensionConstants.Rule.contentType;
- }
-
- @Override
- public int hashCodeForConfig() {
- int h = super.hashCodeForConfig();
- if (_exactMatch)h += 301;
- return h;
- }
-
- public String getDisplayableType() {
- return ValMessages.RuleContentType;
- }
-
- @Override
- public void save(Serializer ser) {
- super.save(ser);
- ser.put(_exactMatch);
- }
-
- public void setData(IConfigurationElement rule) {
- }
-
- public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
- if (_type == null)return Boolean.FALSE;
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- IContentType ct = contentTypeWrapper.getContentType(file);
- if (ct == null)return Boolean.FALSE;
- boolean match = false;
- if (_exactMatch)match = ct.getId().equals(_type.getId());
- else match = ct.isKindOf(_type);
-
- if (match && Tracing.isTraceMatches())
- Tracing.log("FilterRule-01: ", toString() + " has matched " + resource); //$NON-NLS-1$ //$NON-NLS-2$
- return match;
- }
- return Boolean.FALSE;
- }
-
- @Override
- public String toString() {
- if (_exactMatch)return NLS.bind(ValMessages.ContentTypeExact, getDisplayableType(), _pattern);
- return NLS.bind(ValMessages.ContentTypeNotExact, getDisplayableType(), _pattern);
- }
-
- }
-
- public static final class FilePattern extends FilterRuleCaseSensitive {
-
- private final Pattern _compiledPattern;
-
- private static FilePattern createFilePattern(IConfigurationElement rule){
- String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.regex);
- boolean caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
- return new FilePattern(pattern, caseSensitive);
- }
-
- private FilePattern(String pattern, boolean caseSensitive){
- super(pattern, caseSensitive);
- int flags = 0;
- if (caseSensitive)flags = Pattern.CASE_INSENSITIVE;
- Pattern compiledPattern = Pattern.compile(pattern, flags);
- _compiledPattern = compiledPattern;
- }
-
- @Override
- public String getDisplayableType() {
- // FIXME this should be replaced as soon as we are allowed to change the UI.
- return ValMessages.RuleFile;
- }
-
- @Override
- public String getType() {
- return ExtensionConstants.Rule.pattern;
- }
-
- @Override
- public Boolean matchesResource(IResource resource, ContentTypeWrapper wrapper) {
- String name = PortableFileDelim + resource.getProjectRelativePath().toPortableString();
- if (name == null)return Boolean.FALSE;
- return _compiledPattern.matcher(name).matches();
- }
- }
-
- /**
- * Save your settings into the serializer.
- * @param ser
- */
- public void save(Serializer ser) {
- ser.put(getType());
- ser.put(getPattern());
- }
-
- public int hashCodeForConfig() {
- int h = getType().hashCode();
- if (_pattern != null)h += _pattern.hashCode();
- return h;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
deleted file mode 100644
index 2989c2c..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-/**
- * This class represents the global Preferences as set on the Validation Preferences page. It doesn't
- * hold any of the individual validator settings, just the global check boxes. It is an immutable object.
- */
-public final class GlobalPreferences {
-
- /** false - Default setting for the should all the validation be suspended setting. */
- public static final boolean DefaultSuspend = false;
-
- /** false - Default setting for the auto save setting. */
- public static final boolean DefaultAutoSave = false;
-
- /** false - Default setting for the confirm dialog setting. */
- public static final boolean DefaultConfirm = true;
-
- /** false - Default setting for letting projects override the global settings. */
- public static final boolean DefaultOverride = true;
-
- /** 2 - The version of the framework meta data, if an explicit version isn't found. */
- public static final int DefaultFrameworkVersion = 2;
-
- /** Bit masks for what has changed. */
- public final static int ConfirmDialogMask = 1;
- public final static int DisableAllValidationMask = 2;
- public final static int OverrideMask = 4;
- public final static int SaveAutomaticallyMask = 8;
- public final static int StateTimeStampMask = 16;
- public final static int VersionMask = 32;
-
- /**
- * The changes that could affect what gets validated.
- */
- public final static int BuildChangeMask = DisableAllValidationMask | OverrideMask;
-
-
- private final boolean _confirmDialog;
- private final boolean _disableAllValidation;
- private final boolean _override;
- private final boolean _saveAutomatically;
-
- /** The plug-in state time stamp. */
- private final long _stateTimeStamp;
-
- /** The incoming version of the framework. This is used to determine if a migration is needed.*/
- private final int _version;
-
- /**
- * The only valid way to get the global preferences is through the ValManager.
- *
- * @see org.eclipse.wst.validation.internal.ValManager#getGlobalPreferences()
- */
- public GlobalPreferences(GlobalPreferencesValues gp) {
- _confirmDialog = gp.confirmDialog;
- _disableAllValidation = gp.disableAllValidation;
- _override = gp.override;
- _saveAutomatically = gp.saveAutomatically;
- _stateTimeStamp = gp.stateTimeStamp;
- _version = gp.version;
- }
-
- /**
- * Answer a copy of the values.
- * @return
- */
- public GlobalPreferencesValues asValues(){
- GlobalPreferencesValues gp = new GlobalPreferencesValues();
- gp.confirmDialog = _confirmDialog;
- gp.disableAllValidation = _disableAllValidation;
- gp.override = _override;
- gp.saveAutomatically = _saveAutomatically;
- gp.stateTimeStamp = _stateTimeStamp;
- gp.version = _version;
- return gp;
- }
-
- public boolean getSaveAutomatically() {
- return _saveAutomatically;
- }
-
-
- /**
- * Answer if all validation has been disabled.
- */
- public boolean getDisableAllValidation() {
- return _disableAllValidation;
- }
-
- public boolean getConfirmDialog() {
- return _confirmDialog;
- }
-
- public long getStateTimeStamp() {
- return _stateTimeStamp;
- }
-
- /** Answer whether or not projects are allowed to override the global preferences. */
- public boolean getOverride() {
- return _override;
- }
-
- public int getVersion() {
- return _version;
- }
-
- /**
- * Compare yourself to the other global preferences and answer a bitmask with the differences.
- * @param gp
- * @return bit mask of the changes. See the xxxMask constants for the values of the bits. A zero means that they are the same.
- */
- public int compare(GlobalPreferences gp) {
- int changes = 0;
- if (_confirmDialog != gp.getConfirmDialog())changes |= ConfirmDialogMask;
- if (_disableAllValidation != gp.getDisableAllValidation())changes |= DisableAllValidationMask;
- if (_override != gp.getOverride())changes |= OverrideMask;
- if (_saveAutomatically != gp.getSaveAutomatically())changes |= SaveAutomaticallyMask;
- if (_stateTimeStamp != gp.getStateTimeStamp())changes |= StateTimeStampMask;
- if (_version != gp.getVersion())changes |= VersionMask;
- return changes;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java
deleted file mode 100644
index cdf8345..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.model;
-
-/**
- * A mutable object that is used to initialize a GlobalPreference.
- * @author karasiuk
- *
- */
-public class GlobalPreferencesValues {
- public boolean disableAllValidation = GlobalPreferences.DefaultSuspend;
- public boolean saveAutomatically = GlobalPreferences.DefaultAutoSave;
- public boolean confirmDialog = GlobalPreferences.DefaultConfirm;
- public boolean override = GlobalPreferences.DefaultOverride;
-
- /** The plug-in state time stamp. */
- public long stateTimeStamp;
-
- /** The incoming version of the framework. This is used to determine if a migration is needed.*/
- public int version;
-
- public GlobalPreferencesValues(){
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
deleted file mode 100644
index 8c74736..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
+++ /dev/null
@@ -1,46 +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.internal.model;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValType;
-
-/**
- * This interface is implemented by objects that visit enabled validators.
- * <p>
- * Usage:
- * <pre>
- * class Visitor implements IValidatorVisitor {
- * public void visit(Validator validator, IProgressMonitor monitor) {
- * // your code here
- * }
- * }
- * ValidatorManager vm = ValidatorManager.getDefault();
- * vm.accept(new Visitor(), ...);
- * </pre>
- * </p>
- * <p>
- * Clients may implement this interface.
- * </p>
- */
-public interface IValidatorVisitor {
-
- /**
- * Visits the given validator.
- * @param validator
- */
- void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor);
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
deleted file mode 100644
index dd26add..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.model;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.validation.Validator;
-
-/**
- * Validation preferences for a particular project.
- * @author karasiuk
- *
- */
-public final class ProjectPreferences {
- /*
- * Before this object can be considered immutable, the mutable validators need to be addressed.
- */
- /** false - Default setting for the "should all the validation be suspended" setting. */
- public static final boolean DefaultSuspend = false;
-
- /** false - Default setting for letting projects override the global settings. */
- public static final boolean DefaultOverride = false;
-
- private final IProject _project;
-
- private final boolean _override;
- private final boolean _suspend;
-
- private final Validator[] _validators;
-
- public ProjectPreferences(IProject project){
- _project = project;
- _override = DefaultOverride;
- _suspend = DefaultSuspend;
- _validators = new Validator[0];
- }
-
- public ProjectPreferences(IProject project, boolean override, boolean suspend, Validator[] validators){
- _project = project;
- _override = override;
- _suspend = suspend;
- _validators = validators;
- }
-
- public boolean getOverride() {
- return _override;
- }
- public boolean getSuspend() {
- return _suspend;
- }
-
- /**
- * Answer the validators that have been registered for this project.
- * @return an empty array if there are no validators.
- */
- public Validator[] getValidators() {
- return _validators;
- }
-
- public IProject getProject() {
- return _project;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
deleted file mode 100644
index 288f226..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
+++ /dev/null
@@ -1,30 +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.internal.model;
-
-import org.eclipse.wst.validation.internal.ValidatorMutable;
-
-/**
- * Implement some common validator methods, that don't need to be part of the API.
- *
- * @author karasiuk
- *
- */
-public final class ValidatorHelper {
-
- /**
- * Answer true if this validator already has an exclude filter.
- */
- public static boolean hasExcludeGroup(ValidatorMutable v){
- for (FilterGroup group : v.getGroups())if (group.isExclude())return true;
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
deleted file mode 100644
index 4b88f6b..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body>
-<h1>Validation Framework</h1>
-<h3>Build Based Validation</h3>
-The main class for build based validation is the
-<a href="ValBuilderJob.html">ValBuilderJob</a>. This gets triggered as part of the
-build mechanism. It reacts to resource change events, and from that determines what needs to be
-validated.
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
deleted file mode 100644
index caa9b25..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
-<title>Validation Framework</title>
-</head>
-<body>
-<p>A framework for calling validators that are build based.</p>
-<p>
-There are two main types of validation, <b>build based</b> and
-<b>as you type</b>. This framework supports build based
-validation. If auto build is turned on then the validators are called
-when the user saves their file. If auto build is not turned on then
-the validators are called when the user starts a build.</p>
-<p>This framework was added to WTP in version 3.0.</p>
-<h3>Dependency Support</h3>
-<p>Sometimes resources depend on other resources, to determine whether they are
-valid or not. An example would be that an XML resource could depend on a DTD. If at some
-point in the future the DTD changes, then the dependent XML resource should be
-revalidated to ensure that it still meets the requirements of the changed DTD
-file. In order to do this efficiently, there needs to be an association between
-the DTD and all the resources that depend on it.<p>To be as efficient as possible, the validation framework allows
-this dependency information to be returned as part of a
-<a href="AbstractValidator.html#validate(org.eclipse.core.resources.IResource, int, ValidationState, org.eclipse.core.runtime.IProgressMonitor)">
-validate operation</a>. Since the validator needed to figure this out anyways,
-why not pass this information back to the framework, so that it can be saved.
-This saves the cost of having to parse the file at some later point in time
-(when the file is probably sitting cold on disk). The fewer times that we need
-to open, read and/or parse the same file, will improve the performance of the
-product.
-<p>In particular when the validate method returns, a
-<a href="ValidationResult.html">ValidationResult</a> must be returned, inside of
-this result, all your dependencies need to be specified with the
-<a href="ValidationResult.html#setDependsOn(org.eclipse.core.resources.IResource[])">
-setDependsOn</a> method.<p>In addition to keeping the dependency information
-up-to-date through the normal course of validation, direct access is also
-provided to the dependency support through the
-<a href="ValidationFramework.html#getDependencyIndex()">getDependencyIndex</a>
-method. The <a href="IDependencyIndex.html">IDependencyIndex</a> allows you to
-directly manipulate the dependency information for a validator.
-<h3>Entry Points into the Validation Framework</h3>
-<p>Here are some of the points where the platform calls into the framework:</p>
-<ul>
-<li><b>Builder</b> - ValidationBuilder</li>
-<li><b>IFacetedProjectListener</b> - ValManager</li>
-<li><b>IJobChangeListener</b> - ValidationOperation, ValidationOperation.ValidationLauncherJob</li>
-<li><b>IProjectChangeListener</b> - ValManager</li>
-<li><b>IPropertyChangeListener</b> - ValidationConfiguration, DisabledResourceManager</li>
-<li><b>IResourceChangeListener</b> - EventManger</li>
-<li><b>IValChangedListener</b> - ValManager, DisabledValidatorManager</li>
-</ul>
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
deleted file mode 100644
index 92d7647..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="exclude" name="Validator Exclusion"/>
- </appinfo>
- <documentation>
- A way to add additional exclusion filters to a V2 validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validator" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A short id that is unique within the plug-in, so that this set of extra exclusion filters can be identified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The short user friendly name for the exclusion.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validator">
- <annotation>
- <documentation>
- Identifies the validator that is being extended.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="exclude"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualifed validator id that is being extended.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="exclude">
- <annotation>
- <documentation>
- This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="fileext">
- <annotation>
- <documentation>
- A file extension, for example html.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="ext" type="string" use="required">
- <annotation>
- <documentation>
- The file extension, for example html.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file extension is case sensitive, then this needs to be set to true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <annotation>
- <documentation>
- Used to filter on project natures.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="file">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" use="required">
- <annotation>
- <documentation>
- Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul>
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="folder">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="full">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="rules">
- <annotation>
- <documentation>
- A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="pattern" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="facet">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The facet id.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contentType">
- <annotation>
- <documentation>
- Used to filter based on content types.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The content type id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exactMatch" type="boolean">
- <annotation>
- <documentation>
- Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
- <element name="pattern">
- <annotation>
- <documentation>
- Holds a regualr expression, that matches the resource's project relative name.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="regex" type="string" use="required">
- <annotation>
- <documentation>
- Holds a Java regular expression. See the class java.util.regex.Pattern for more details. This regular expression is matched against a resource's project relative path, after that path has been converted into a portable path.
-<p>The path will always start with a forward slash (/) so that folder names can be more easily matched.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.0
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- <!-- A plug-in is turning off the T1A validator for projects that have the ModuleCoreNature -->
- <extension
- id="exclude1"
- point="org.eclipse.wst.validation.exclude">
- <validator
- id="org.eclipse.wst.common.tests.validation.T1A">
- <exclude>
- <rules>
- <projectNature
- id="org.eclipse.jst.j2ee.ModuleCoreNature">
- </projectNature>
- </rules>
- </exclude>
- </validator>
- </extension>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiInfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
-
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
deleted file mode 100644
index fcfe873..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="referencialFileValidator" name="Referencial File Validator"/>
- </appInfo>
- <documentation>
- This extension point is used for referential file validation. This extension point should be extended if you have files that reference other files and would like the validation on referenced files to run when the validation on the referencing file is run. The Post Validator operation that is used by this extension point expects a flat list of files to run validation on referenced files.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="referencialFileValidator"/>
- </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="referencialFileValidator">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class must implement org.eclipse.wst.validation.internal.operations.ReferencialFileValidator.
- </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="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.validation/xsds/validationHelper.exsd b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
deleted file mode 100644
index fd854dc..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validationHelper" name="Validation Helper"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validationHelper"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validationHelper">
- <complexType>
- <attribute name="helperClass" type="string" use="required">
- <annotation>
- <documentation>
- The class must implement org.eclipse.wst.validation.internal.IProjectValidationHelper.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </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="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.validation/xsds/validator.exsd b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
deleted file mode 100644
index fcb4818..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validator.exsd
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validator-v2" name="Validator V2"/>
- </appinfo>
- <documentation>
- This is used to register a validator to the validation framework (version 2). In addition to specifying the validator to invoke, it registers a set of default filter rules, to control which resources are passsed to the validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="validator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A short id that is unique within the plug-in, so that this validator can be identified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The short user friendly name of the validator.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validator">
- <annotation>
- <documentation>
- Defines a validator to the validation framework.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="include" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="exclude" minOccurs="0" maxOccurs="1"/>
- <element ref="messageCategory" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="group" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The class that implements the validator.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.AbstractValidator"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="build" type="boolean">
- <annotation>
- <documentation>
- Is this validator enabled by default for build based validations? The default is true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="manual" type="boolean">
- <annotation>
- <documentation>
- Is this validator enabled by default for manual based validations? The default is true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string">
- <annotation>
- <documentation>
- The version of the definition. It is a simple integer. If not specified the version is assumed to be 1.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="sourceid" type="string">
- <annotation>
- <documentation>
- If this validator also serves as an as-you-type validator (also know as an ISourceValidator) then it's source id is specified here, so that the two validators can be associated with one another.
-By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="markerId" type="string">
- <annotation>
- <documentation>
- If your validator wishes to use it's own marker, it can do so by supplying that marker id here.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="include">
- <annotation>
- <documentation>
- This contains a set of inclusion rules, which are used in filtering which resources get validated. At least one of these rules must be satisfied in order for the validator to be called on the particular resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="exclude">
- <annotation>
- <documentation>
- This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="rules"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="fileext">
- <annotation>
- <documentation>
- A file extension, for example html.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="ext" type="string" use="required">
- <annotation>
- <documentation>
- The file extension, for example html.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file extension is case sensitive, then this needs to be set to true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <annotation>
- <documentation>
- Used to filter on project natures.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified project nature id, for example "org.eclipse.jdt.core.javanature".
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="file">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The file or folder name. The file name can be fully qualified, that is it starts with a leading slash ("/"), or it can be a relative name. Folder names are separated with the forward slash ("/") character.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" use="required">
- <annotation>
- <documentation>
- Type of name, there are three choices. <ul><li>folder - specifies a project relative folder name.</li><li>file - a simple file name (i.e. no path information).</li><li>full - a fully qualified (project relative) file name.</li></ul>
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="folder">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="full">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="rules">
- <annotation>
- <documentation>
- A set of rules for determining if a resource is passed to this validator or not. The rules are OR'ed together.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="pattern" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="facet">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The facet id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string">
- <annotation>
- <documentation>
- A version expression that can be used to futher qualify the match. If not specifed, then versions are not used as a criteria for selecting the facet. The syntax of this expression, is the same syntax that is used by the facet framework.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="group">
- <annotation>
- <documentation>
- Declares that this validator belongs to this validation group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified ID of the validation group to which this validator belongs.
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contentType">
- <annotation>
- <documentation>
- Used to filter based on content types.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The content type id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exactMatch" type="boolean">
- <annotation>
- <documentation>
- Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="messageCategory">
- <annotation>
- <documentation>
- Used to group together a set of messages, where the user can change the message severity of all the messages in the group. This is similar to the support in the JDT, where for example a user can specify whether used methods should be errors, warnings or ignored.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A simple id that is unique within the scope of this validator.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- A short, one line label that is displayed to the end user, that describes the message category.
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="severity">
- <annotation>
- <documentation>
- The default severity for this category.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="error">
- </enumeration>
- <enumeration value="warning">
- </enumeration>
- <enumeration value="ignore">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="pattern">
- <annotation>
- <documentation>
- Holds a regualr expression, that matches the resource's project relative name.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="regex" type="string" use="required">
- <annotation>
- <documentation>
- Holds a Java regular expression. See the class java.util.regex.Pattern for more details. This regular expression is matched against a resource's project relative path, after that path has been converted into a portable path.
-<p>The path will always start with a forward slash (/) so that folder names can be more easily matched.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
- If the file name is not case senstitive, then this needs to be set to false.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="apiInfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.0.
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- An example of a validator that will be called on resources that have html or htm file extensions.
-<pre>
- <extension
- point="org.eclipse.wst.validation.validator"
- id="Test" name="%Validator.Name">
- <validator class="org.eclipse.wst.validation.test.TestValidator">
- <include>
- <rules>
- <fileext ext="html"/>
- <fileext ext="htm"/>
- </rules>
- </include>
- </validator>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2007,2008 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.validation/xsds/validatorDelegates.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
deleted file mode 100644
index 4a5f850..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validatorDelegates" name="Validator Delegates"/>
- </appInfo>
- <documentation>
- This extension point allows validator providers to contribute alternate implementations for a delegating validator.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="delegate"/>
- </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="delegate">
- <annotation>
- <documentation>
- Defines a validator delegate. Delegating validators can have one or more delegates registered, only one of which can be active (selected) at once.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- Specifies the class name of the delegate validator. The class must implement IValidatorJob.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.internal.provisional.core.IValidatorJob"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="target" type="string" use="required">
- <annotation>
- <documentation>
- Specifies the id of the validator extension for which this delegate is being registered.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </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="examples"/>
- </appInfo>
- <documentation>
- <extension point="org.eclipse.wst.validation.validatorDelegates">
- <delegate
- class="com.acme.fast.SuperFastValidator"
- name="Super fast validator"
- target="org.acme.core.ACMEDelegatingValidator"/>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- A delegate validator will have to implement the IValidatorJob interface.
-The target validator, the one who will delegate its implementation to a delegate validator will have to extend org.eclipse.wst.validation.delegates.BaseDelegatingValidator.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2006 IBM Corporation and others.<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.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
deleted file mode 100644
index 25d2602..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validator" name="Validator"/>
- </appInfo>
- <documentation>
- This extension point give the ability to create a new validator that can validate resources in a Java Project. The validator needs to registered for a given nature of the project for it to run on that project. The user can specifiy file filters to filter out files that need to be validated. The new validator registered by the project nature on the project can be run manually or incrementally if Auto Build is turned on, during incremental builds the changed delta of files are only validated if those files are part of the validation filters specified.
- </documentation>
- </annotation>
-
- <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- A fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- An optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- An optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validator">
- <complexType>
- <sequence>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="filter" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="enablement" minOccurs="0" maxOccurs="unbounded"/>/>
- <element ref="helper"/>
- <element ref="dependentValidator" minOccurs="0" maxOccurs="1"/>
- <element ref="run"/>
- <element ref="markerId" minOccurs="0" maxOccurs="1"/>
- <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contentTypeBinding" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="to" type="string">
- <annotation>
- <documentation>
- Optional migration tag
- </documentation>
- </annotation>
- </attribute>
- <attribute name="from" type="string">
- <annotation>
- <documentation>
- Optional migration tag
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="include" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
- <element name="contentTypeBinding">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="contentTypeId"/>
- </appInfo>
- <documentation>
- Associates a particular content type with the current validator, and enables the validator to be run on resources of the specified content type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="contentTypeId" type="string" use="required">
- <annotation>
- <documentation>
- The content type identifier. This is an ID defined by the 'org.eclipse.core.runtime.contentTypes' extension point.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
-
-
- <element name="filter">
- <complexType>
- <attribute name="objectClass" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="nameFilter" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="caseSensitive" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="action" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="helper">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="dependentValidator">
- <complexType>
- <attribute name="depValValue" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="incremental" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="enabled" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="fullBuild" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="async" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="markerId">
- <annotation>
- <documentation>
- The markerId element is is used to get a custom problem marker for the custom validator implemented using this extension point
-
-This markerId element also needs a corresponding problemMarker extension to be defined bythis validator with the same Id as the makerIdValue for the validator to have its own marker type. Here is an example of the a problemMarker extension defined for a markerIdValue "FooMarker"
-
- <extension
- id="FooMarker"
- name="%EJB_VALIDATION_PROBLEMMARKER_NAME"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.wst.validation.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- <attribute
- name="owner">
- </attribute>
- <attribute
- name="validationSeverity">
- </attribute>
- <attribute
- name="targetObject">
- </attribute>
- <attribute
- name="groupName">
- </attribute>
- <attribute
- name="messageId">
- </attribute>
- </extension>
-
- Without a problemMarker extension defined, the customer validator will use the base Validation Message problemMarker type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="markerIdValue" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="facet">
- <annotation>
- <appInfo>
- <meta.element deprecated="true"/>
- </appInfo>
- <documentation>
- This element is deprecated and enablement is the new recommended approach to filter validators based on facets.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="facetId" type="string">
- <annotation>
- <documentation>
-
- </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="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<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.validation/xsds/validatorgroup.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
deleted file mode 100644
index df05cb1..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.validation" id="validatorGroup" name="Validator Group"/>
- </appinfo>
- <documentation>
- Defines a grouping for validators with listeners notified of group members' activites. Useful for pre-caching common information used by multiple validators and disposing of that information when they're all done.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="group" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="identifier">
- <annotation>
- <documentation>
- A unique identifier for this extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- A name for this extension
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="listener">
- <annotation>
- <documentation>
- A listener for activities in this group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The listener's class.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.wst.validation.IValidatorGroupListener"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="group">
- <annotation>
- <documentation>
- Declares a validator group. A group may have multiple listeners.
- </documentation>
- </annotation>
- <complexType>
- <choice>
- <element ref="listener" minOccurs="1" maxOccurs="unbounded"/>
- </choice>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="identifier"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WebTools 3.0
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- Define a listener that simply prints that it has been called.
-<pre>
-<extension point="org.eclipse.wst.validation.validatorGroup">
- <group id="validatorGroup">
- <listener class="org.eclipse.wst.validation.example.ValidatorGroupListener"/>
- </group>
-</extension>
-
-public class org.eclipse.wst.validation.example.ValidatorGroupListener implements IValidatorGroupListener {
-
- public ValidatorGroupListener() {
- }
-
- public void validationFinishing(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Finishing:" + resource.getFullPath());
- }
-
- public void validationStarting(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
- System.out.println("Starting:" + resource.getFullPath());
- }
-}
-
-<extension id="id" name="name" point="org.eclipse.wst.validation.validatorV2">
- <validator class="org.eclipse.wst.validation.example.Validator">
- <group id="org.eclipse.wst.validation.example.validatorGroup"/>
- </validator>
-</extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- Provisional API.
- </documentation>
- </annotation>
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2008 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>
