This commit was manufactured by cvs2svn to create tag 'v200710171900'.
diff --git a/docs/org.eclipse.wst.validation.infopop/.cvsignore b/docs/org.eclipse.wst.validation.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.validation.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.validation.infopop/.project b/docs/org.eclipse.wst.validation.infopop/.project
deleted file mode 100644
index 28f5b4f..0000000
--- a/docs/org.eclipse.wst.validation.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.validation.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.validation.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 7161932..0000000
--- a/docs/org.eclipse.wst.validation.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.wst.validation.infopop; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %Plugin.providerName
diff --git a/docs/org.eclipse.wst.validation.infopop/ValidationPrefs_HelpContexts.xml b/docs/org.eclipse.wst.validation.infopop/ValidationPrefs_HelpContexts.xml
deleted file mode 100644
index 9a8ccfa..0000000
--- a/docs/org.eclipse.wst.validation.infopop/ValidationPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
- <!-- Eclipse Validation preferences -->
-<context id="jvgp0000">
-<description>The validation preferences page allows you to view or change the default validation settings for all workbench projects. A validator is a tool that checks that resources conform to a specification, DTD, or some other set of rules.
-
-Each validator can apply to certain types of files, certain project natures, and certain project facets. When a validator applies to a project facet or nature, the workbench uses that validator only on projects that have that facet or nature. Likewise, most validators apply only to certain types of files, so the workbench uses those validators only on those types of files.
-
-Select the <b>Allow projects to override these preference settings</b> check box if you want to allow individual projects to set their own validation preferences. To configure new validation settings for an individual project, select the project in the Navigator view, right-click and select <b>Properties</b> > <b>Validation</b> .
-
-Select the <b>Suspend all validators</b> check box to prevent validation at the global level. If you select this check box, you can still enable validation at the project level.
-
-Select the <b>Save all modified resources automatically prior to validating</b> check box if you want to save any resources you have modified before the validation begins.
-
-In the list of validators, select the check boxes next to each validator you want to use at the global level. Each validator has a check box to specify whether it is used on manual validation or on build validation. Choose an alternate implementation for a validator by clicking the button in the <b>Settings</b> column. Not all validators have alternate implementations.
-
-</description>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" label="Validating code in enterprise applications"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html" label="Overriding global validation preferences"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html" label="Common validation errors and solutions"/>
-</context>
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.infopop/ValidationProjPrefs_HelpContexts.xml b/docs/org.eclipse.wst.validation.infopop/ValidationProjPrefs_HelpContexts.xml
deleted file mode 100644
index 489af37..0000000
--- a/docs/org.eclipse.wst.validation.infopop/ValidationProjPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
- <!-- Validation settings for project -->
-
-<context id="jvpp0000">
-<description>The project validation page allows you to view or change the validation settings for a project. A validator is a tool that checks that resources conform to a specification, DTD, or some other set of rules.
-
-Each validator can apply to certain types of files, certain project natures, and certain project facets. When a validator applies to a project facet or nature, the workbench uses that validator only on projects that have that facet or nature. Likewise, most validators apply only to certain types of files, so the workbench uses those validators only on those types of files.
-
-Select the <b>Override validation preferences</b> check box if you want to override the default validation preferences set in the workbench Preferences page. If the <b>Override validation preferences</b> check box is not enabled, go to <b>Window</b> > <b>Preferences</b> > <b>Validation</b> and select the <b>Allow projects to override these preference settings</b> check box.
-
-Select the <b>Suspend all validators</b> check box to prevent validation for this project.
-
-In the list of validators, select the check boxes next to each validator you want to use for this project. Each validator has a check box to specify whether it is used on manual validation or on build validation. Choose an alternate implementation for a validator by clicking the button in the <b>Settings</b> column. Not all validators have alternate implementations.
-
-</description>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" label="Validating code in enterprise applications"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html" label="Overriding global validation preferences"/>
-<topic href="../org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html" label="Common validation errors and solutions"/>
-</context>
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.infopop/about.html b/docs/org.eclipse.wst.validation.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.validation.infopop/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors 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/docs/org.eclipse.wst.validation.infopop/build.properties b/docs/org.eclipse.wst.validation.infopop/build.properties
deleted file mode 100644
index ac322ed..0000000
--- a/docs/org.eclipse.wst.validation.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = META-INF/,\
- plugin.xml,\
- ValidationPrefs_HelpContexts.xml,\
- ValidationProjPrefs_HelpContexts.xml,\
- plugin.properties,\
- about.html
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.validation.infopop/plugin.properties b/docs/org.eclipse.wst.validation.infopop/plugin.properties
deleted file mode 100644
index b0c0709..0000000
--- a/docs/org.eclipse.wst.validation.infopop/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = WST validation infopop plug-in
-Plugin.providerName = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.validation.infopop/plugin.xml b/docs/org.eclipse.wst.validation.infopop/plugin.xml
deleted file mode 100644
index aaf27bf..0000000
--- a/docs/org.eclipse.wst.validation.infopop/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.help.contexts">
- <contexts file="ValidationProjPrefs_HelpContexts.xml" plugin="org.eclipse.wst.validation.ui" />
- <contexts file="ValidationPrefs_HelpContexts.xml" plugin="org.eclipse.wst.validation.ui" />
- </extension>
-
-</plugin>
diff --git a/features/org.eclipse.wst.common_core.feature.patch/.project b/features/org.eclipse.wst.common_core.feature.patch/.project
deleted file mode 100644
index eb1e1ea..0000000
--- a/features/org.eclipse.wst.common_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.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.wst.common_core.feature.patch/description.txt b/features/org.eclipse.wst.common_core.feature.patch/description.txt
deleted file mode 100644
index a1fc6d0..0000000
--- a/features/org.eclipse.wst.common_core.feature.patch/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The HEAD branch of this patch feature is intentionally empty,
-to attempt to try and avoid confusion.
-
-Please load the correct version from the branch of the related patch.
diff --git a/features/org.eclipse.wst.common_core.feature/.cvsignore b/features/org.eclipse.wst.common_core.feature/.cvsignore
deleted file mode 100644
index 2620caa..0000000
--- a/features/org.eclipse.wst.common_core.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.common_core.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.common_core.feature/.project b/features/org.eclipse.wst.common_core.feature/.project
deleted file mode 100644
index 192f462..0000000
--- a/features/org.eclipse.wst.common_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.common_core.feature/addPreBuiltComponents.xml b/features/org.eclipse.wst.common_core.feature/addPreBuiltComponents.xml
deleted file mode 100644
index f02a4cf..0000000
--- a/features/org.eclipse.wst.common_core.feature/addPreBuiltComponents.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Callbacks to use when building this feature -->
-<!-- -->
-<!-- build.properties must have a line that says -->
-<!-- customBuildCallbacks=addPreBuiltComponents.xml -->
-<!-- ===================================================================== -->
-<project name="addPreBuiltComponents" default="noDefault">
- <!--
- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - the directory plugins will be collected to -->
- <!-- feature.directory - the directory containing the resulting feature -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- <!-- copy our known, pre-built, usually third party pre-reqs into this feature -->
- <echo message="Current basedir during callback: ${basedir}" />
- <echo message="Current destination.temp.folder during callback: ${destination.temp.folder}" />
- <copy
- todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/" includes="org.eclipse.jem*/**" />
- </copy>
- <copy
- todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/" includes="com.ibm.etools.emf.event*/**" />
- </copy>
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - the directory plugins will be collected to -->
- <!-- feature.directory - the directory containing the resulting feature -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
-
-
- <!-- ===================================================================== -->
- <!-- No Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="This file must be called with explicit targets" />
- </target>
-
-
-</project>
diff --git a/features/org.eclipse.wst.common_core.feature/build.properties b/features/org.eclipse.wst.common_core.feature/build.properties
deleted file mode 100644
index 364480b..0000000
--- a/features/org.eclipse.wst.common_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
diff --git a/features/org.eclipse.wst.common_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/epl-v10.html b/features/org.eclipse.wst.common_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.common_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature/feature.properties b/features/org.eclipse.wst.common_core.feature/feature.properties
deleted file mode 100644
index 41d223f..0000000
--- a/features/org.eclipse.wst.common_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +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
-###############################################################################
-# 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=WST Common Core
-
-# "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=WST common core functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
deleted file mode 100644
index a1b7c14..0000000
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_core.feature"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.command.env.core" version="1.0.101" match="equivalent"/>
- <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
- <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.4.4.1" match="compatible"/>
- <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.ant.core" version="3.1.100" match="equivalent"/>
- <import plugin="org.eclipse.osgi.util" version="3.1.100" match="compatible"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.common.emfworkbench.integration"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.command.env"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.command.env.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <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.environment"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.frameworks"
- 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.common.project.facet.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.uriresolver"
- 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.wst.common.core"
- 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/license.html b/features/org.eclipse.wst.common_core.feature/license.html
deleted file mode 100644
index 76abfb4..0000000
--- a/features/org.eclipse.wst.common_core.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 52d0f54..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# 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=WST Common Core Developer Resources
-# "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=Source code zips for WST common core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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.wst.common_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 20d6b1b..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_core.feature.source"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.common_core.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 9474fc0..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Common Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index c325b0a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Common Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_sdk.feature/.cvsignore b/features/org.eclipse.wst.common_sdk.feature/.cvsignore
deleted file mode 100644
index 413925b..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-org.eclipse.wst.common_sdk.feature_1.0.0.bin.dist.zip
-build.xml
-features
-plugins
diff --git a/features/org.eclipse.wst.common_sdk.feature/.project b/features/org.eclipse.wst.common_sdk.feature/.project
deleted file mode 100644
index fb86250..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.common_sdk.feature/build.properties b/features/org.eclipse.wst.common_sdk.feature/build.properties
deleted file mode 100644
index 5391fbd..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-generate.feature@org.eclipse.wst.common_ui.feature.source=org.eclipse.wst.common_ui.feature
-bin.includes = feature.xml,\
- epl-v10.html,\
- license.html,\
- eclipse_update_120.jpg,\
- feature.properties
diff --git a/features/org.eclipse.wst.common_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_sdk.feature/epl-v10.html b/features/org.eclipse.wst.common_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.properties b/features/org.eclipse.wst.common_sdk.feature/feature.properties
deleted file mode 100644
index 446e00e..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +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
-###############################################################################
-# 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=WST Common Plug-in Developer Resources
-
-# "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=Source code zips for WST common tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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.wst.common_sdk.feature/feature.xml b/features/org.eclipse.wst.common_sdk.feature/feature.xml
deleted file mode 100644
index a105182..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_sdk.feature"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.common_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.common_ui.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_sdk.feature/license.html b/features/org.eclipse.wst.common_sdk.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.common_sdk.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.common_ui.feature/.cvsignore b/features/org.eclipse.wst.common_ui.feature/.cvsignore
deleted file mode 100644
index e00af7d..0000000
--- a/features/org.eclipse.wst.common_ui.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.common_ui.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.common_ui.feature/.project b/features/org.eclipse.wst.common_ui.feature/.project
deleted file mode 100644
index 221164f..0000000
--- a/features/org.eclipse.wst.common_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.common_ui.feature/build.properties b/features/org.eclipse.wst.common_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.common_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.common_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/epl-v10.html b/features/org.eclipse.wst.common_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.common_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.properties b/features/org.eclipse.wst.common_ui.feature/feature.properties
deleted file mode 100644
index 44d87a9..0000000
--- a/features/org.eclipse.wst.common_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +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
-###############################################################################
-# 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=WST Common UI
-
-# "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=WST common UI functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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.wst.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
deleted file mode 100644
index 6e5824b..0000000
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_ui.feature"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.common_core.feature"
- version="0.0.0"/>
-
- <requires>
- <import plugin="org.eclipse.wst.command.env.core" version="1.0.101" match="equivalent"/>
- <import plugin="org.eclipse.wst.command.env" version="1.0.101" match="equivalent"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
- <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
- <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.runtime.compatibility" version="3.1.100" match="equivalent"/>
- <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.search" version="3.2.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.command.env.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.frameworks.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.project.facet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.snippets"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.common.ui.properties"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.internet.cache"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.validation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.command.env.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.validation.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_ui.feature/license.html b/features/org.eclipse.wst.common_ui.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.common_ui.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index e878555..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.wst.common_core.feature.source = org.eclipse.wst.common_core.feature
-
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index c861cfb..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,146 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# 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=WST Common UI Developer Resources
-
-# "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=Source code zips for WST Common UI.
-
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-June 06, 2007\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\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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.wst.common_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 4111657..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_ui.feature.source"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.wst.common_core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.common_core.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common_ui.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 40314ea..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Common UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 4c0b73c..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Common UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.core/.classpath b/plugins/org.eclipse.wst.common.core/.classpath
deleted file mode 100644
index 21f2a57..0000000
--- a/plugins/org.eclipse.wst.common.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-search"/>
- <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"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.core/.cvsignore b/plugins/org.eclipse.wst.common.core/.cvsignore
deleted file mode 100644
index 0f861fd..0000000
--- a/plugins/org.eclipse.wst.common.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-javaCompiler...args
-src.zip
-@dot
-temp.folder
diff --git a/plugins/org.eclipse.wst.common.core/.options b/plugins/org.eclipse.wst.common.core/.options
deleted file mode 100644
index 2e5ed2a..0000000
--- a/plugins/org.eclipse.wst.common.core/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.common.search/perf=false
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.core/.project b/plugins/org.eclipse.wst.common.core/.project
deleted file mode 100644
index 6bb12ef..0000000
--- a/plugins/org.eclipse.wst.common.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </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.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7406de6..0000000
--- a/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-#Mon Jan 30 23:40:52 EST 2006
-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=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-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=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=warning
-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.3
diff --git a/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c68ceb4..0000000
--- a/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jan 30 19:45:41 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 598248e..0000000
--- a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.core; singleton:=true
-Bundle-Version: 1.1.101.qualifier
-Bundle-Activator: org.eclipse.wst.common.core.search.SearchPlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.core.search,
- org.eclipse.wst.common.core.search.document,
- org.eclipse.wst.common.core.search.internal;x-internal:=true,
- org.eclipse.wst.common.core.search.pattern,
- org.eclipse.wst.common.core.search.scope,
- org.eclipse.wst.common.core.search.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.core/about.html b/plugins/org.eclipse.wst.common.core/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.core/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.core/build.properties b/plugins/org.eclipse.wst.common.core/build.properties
deleted file mode 100644
index cd3e92f..0000000
--- a/plugins/org.eclipse.wst.common.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src-search/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- schema/,\
- plugin.properties,\
- about.html
diff --git a/plugins/org.eclipse.wst.common.core/component.xml b/plugins/org.eclipse.wst.common.core/component.xml
deleted file mode 100644
index 3e9239c..0000000
--- a/plugins/org.eclipse.wst.common.core/component.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
- name="org.eclipse.wst.common.core">
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.wst.common.core" fragment="false" />
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.core/plugin.properties b/plugins/org.eclipse.wst.common.core/plugin.properties
deleted file mode 100644
index ff6cdef..0000000
--- a/plugins/org.eclipse.wst.common.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-! Plug-in properties
-pluginName = WST Common Core Plug-in
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.core/plugin.xml b/plugins/org.eclipse.wst.common.core/plugin.xml
deleted file mode 100644
index c82f6a0..0000000
--- a/plugins/org.eclipse.wst.common.core/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="searchParticipants" name="%searchParticipants" />
-</plugin>
-
-
diff --git a/plugins/org.eclipse.wst.common.core/schema/searchParticipants.exsd b/plugins/org.eclipse.wst.common.core/schema/searchParticipants.exsd
deleted file mode 100644
index 367c943..0000000
--- a/plugins/org.eclipse.wst.common.core/schema/searchParticipants.exsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.search" id="searchParticipants" name="%searchPArticipants"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- </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>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/ISearchOptions.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/ISearchOptions.java
deleted file mode 100644
index 33305e5..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/ISearchOptions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search;
-
-/**
- * This interface provides values that can be used in the map of search options passed
- * to
- * {@link SearchEngine#search(org.eclipse.wst.common.core.search.pattern.SearchPattern, SearchRequestor, org.eclipse.wst.common.core.search.scope.SearchScope, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
- * SearchEngine.search()}.
- * <p>
- * Note that not all search participants will provide specialized behavior based on
- * use of these search options.
- * <p>
- * Also note that individual search participants may support additional options not
- * listed here. These search options should be formed so that a search participant can
- * safely ignore any that it does not understand.
- *
- * <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 ISearchOptions {
-
- /**
- * Search option specifying a trade-off choice between search performance and
- * completeness.
- */
- public static final String PRIORITY_OPTION = "org.eclipse.wst.common.core.search.PRIORITY"; //$NON_NLS_1$
- /**
- * Choice for the {@link #PRIORITY_OPTION} search option that emphasizes
- * performance at the possible expense of accuracy. This value should be used for
- * all search calls made on the user interface thread. In some cases, search
- * results may not be complete because of inaccuracies caused by timing windows.
- */
- public static final String PRIORITY_VALUE_TIMELINESS = "FAST_SEARCH"; //$NON_NLS_1$
- /**
- * Choice for the {@link #PRIORITY_OPTION} search option that emphasizes
- * accuracy at the possible expense of timeliness. This value should never be used
- * for search calls made on the user interface thread, because some search
- * participants may choose to use time-consuming background processing to return a
- * complete set of matches.
- */
- public static final String PRIORITY_VALUE_COMPLETENESS = "COMPLETE_SEARCH"; //$NON_NLS_1$
- /**
- * Default choice for the {@link #PRIORITY_OPTION} search option.
- */
- public static final String PRIORITY_VALUE_DEFAULT = PRIORITY_VALUE_TIMELINESS;
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java
deleted file mode 100644
index 3fed117..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java
+++ /dev/null
@@ -1,213 +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.wst.common.core.search;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.wst.common.core.search.document.SearchDocumentSet;
-import org.eclipse.wst.common.core.search.internal.Messages;
-import org.eclipse.wst.common.core.search.internal.SearchDocumentSetImpl;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-
-/**
- * The {@link SearchEngine} class provides a generic way of searching for information
- * without the need of knowing how or where that information is stored. The results
- * returned by a search could be scattered in a number of files or stored in an index.
- * Examples of the information you can search for include element declarations and
- * references, references between files, and use of qualifiers.
- * <p>
- * The search can be limited to a specified search scope, or the entire workspace can
- * be searched. Search matches are returned to the specified {@link SearchRequestor}.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- *
- * <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 SearchEngine implements ISearchOptions
-{
-
- /**
- * Searches for matches of a given search pattern using a specified set of search
- * participants and search scope. Search patterns can be created using factory
- * methods and encapsulate the description of the information to be searched for
- * (for example, element declarations of a specified type, in a case sensitive
- * manner).
- * @param pattern
- * The pattern describing the information to search for
- * @param requestor
- * Callback object to notify with the results of the search (each match
- * is reported to {@link SearchRequestor#acceptSearchMatch(SearchMatch)})
- * @param participants
- * The search participants that will conduct the search
- * @param scope
- * Optional search scope to limit the source of search candidates;
- * specify <code>null</code> to search the entire workspace
- * @param searchOptions
- * Optional map of options and values defining behavior of the search;
- * some options and values are provided by {@link ISearchOptions}
- * @param monitor
- * Optional progress monitor used to report work completed
- * @exception CoreException
- * if the search fails
- */
- public void search(SearchPattern pattern, SearchRequestor requestor,
- SearchParticipant[] participants, SearchScope scope, Map searchOptions,
- IProgressMonitor monitor) throws CoreException
- {
-
- if (monitor != null && monitor.isCanceled())
- throw new OperationCanceledException();
-
- /* initialize progress monitor */
- if (monitor != null)
- monitor.beginTask(Messages.engine_searching, 100);
-
- SearchDocumentSet set = new SearchDocumentSetImpl();
- try
- {
- // requestor.beginReporting();
- SearchScope[] scopeArray = new SearchScope[participants.length];
- for (int i = 0, l = participants == null ? 0 : participants.length; i < l; i++)
- {
- if (monitor != null && monitor.isCanceled())
- throw new OperationCanceledException();
-
- SearchParticipant participant = participants[i];
- SubProgressMonitor subMonitor = monitor == null ? null
- : new SubProgressMonitor(monitor, 1000);
- if (subMonitor != null)
- subMonitor.beginTask("", 1000); //$NON-NLS-1$
- try
- {
- if (subMonitor != null)
- subMonitor.subTask(Messages.bind(
- Messages.engine_searching_locatingDocuments,
- new String[]
- { participant.getDescription() }));
- participant.beginSearching(pattern, searchOptions);
- // requestor.enterParticipant(participant);
- // participant creates it's own search scope
- SearchScope newScope =
- participant.selectDocumentLocations(pattern, scope, searchOptions, monitor);
- scopeArray[i] = newScope;
- // participant creates search documents based on it's search scope
- participant.createSearchDocuments(set, pattern, newScope, searchOptions, subMonitor);
- }
- catch(Exception e)
- {
- }
- }
- for (int i = 0, l = participants == null ? 0 : participants.length; i < l; i++)
- {
- if (monitor != null && monitor.isCanceled())
- throw new OperationCanceledException();
-
- SearchParticipant participant = participants[i];
- SubProgressMonitor subMonitor = monitor == null ? null
- : new SubProgressMonitor(monitor, 1000);
- if (subMonitor != null && subMonitor.isCanceled())
- throw new OperationCanceledException();
- try
- {
- // locate index matches if any (note that all search matches
- // could have been issued during index querying)
- if (subMonitor != null)
- subMonitor.subTask(Messages.bind(
- Messages.engine_searching_matching,
- new String[]
- { participant.getDescription() }));
- // a search document set should contain enough info to reduce the search scope even further
- // before finding precize locations
-
- // the scope could be null if the partcipant barfed and exeption in the first loop
- if (scopeArray[i] != null)
- {
- participant.locateMatches(set, pattern, scopeArray[i], requestor, searchOptions, subMonitor);
- }
- }
- catch (Exception e)
- {
-
- }
- finally
- {
- // requestor.exitParticipant(participant);
- participant.doneSearching(pattern, searchOptions);
- }
- }
- } finally
- {
- set.dispose();
- // requestor.endReporting();
- if (monitor != null)
- monitor.done();
- }
- }
-
- /**
- * Searches for matches of a given search pattern. Search patterns can be created
- * using factory methods and encapsulate the description of the information to be
- * searched for (for example, element declarations of a specified type, in a case
- * sensitive manner).
- * @param pattern
- * The pattern describing the information to search for
- * @param requestor
- * Callback object to notify with the results of the search (each match
- * is reported to {@link SearchRequestor#acceptSearchMatch(SearchMatch)})
- * @param scope
- * Optional search scope to limit the source of search candidates;
- * specify <code>null</code> to search the entire workspace
- * @param searchOptions
- * Optional map of options and values defining behavior of the search;
- * some options and values are provided by {@link ISearchOptions}
- * @param monitor
- * Optional progress monitor used to report work completed
- * @exception CoreException
- * if the search fails
- */
- public void search(SearchPattern pattern, SearchRequestor requestor,
- SearchScope scope, Map searchOptions, IProgressMonitor monitor)
- throws CoreException
- {
- SearchParticipant[] participants =
- getApplicableParticipants(pattern, searchOptions);
- //System.out.println("participants = " + participants.length);
- search(pattern, requestor, participants, scope, searchOptions, monitor);
- }
-
- /**
- * Queries the set of participants that support searches described by the
- * specified search pattern and options.
- * @param pattern
- * The pattern describing the information to search for
- * @param searchOptions
- * Optional map of options and values defining behavior of the search;
- * some options and values are provided by {@link ISearchOptions}
- * @return Array of applicable search participants
- */
- public SearchParticipant[] getApplicableParticipants(SearchPattern pattern,
- Map searchOptions)
- {
- return SearchPlugin.getDefault().loadSearchParticipants(pattern, searchOptions);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchMatch.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchMatch.java
deleted file mode 100644
index 11969e5..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchMatch.java
+++ /dev/null
@@ -1,156 +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.wst.common.core.search;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * A search match represents the result of a search query.
- * <p>
- * This class is intended to be instantiated and subclassed by clients.
- * </p>
- * <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>
- *
- * @see SearchEngine#search(org.eclipse.wst.common.core.search.pattern.SearchPattern, SearchParticipant[], ISearchScope,
- * SearchRequestor, org.eclipse.core.runtime.IProgressMonitor)
- */
-public class SearchMatch implements IAdaptable
-{
-
- /**
- * Optional resource of the element
- */
- IFile file; // resource where match is found
-
- /**
- * The offset the match starts at, or -1 if unknown
- */
- int offset;
-
- /**
- * The length the length of the match, or -1 if unknown
- */
- int length;
-
- /**
- * Optional element that encloses or corresponds to the match
- */
- Object object;
-
- /**
- * Creates a new search match.
- *
- * @param element
- * the element that encloses or corresponds to the match, or
- * <code>null</code> if none
- * @param offset
- * the offset the match starts at, or -1 if unknown
- * @param length
- * the length of the match, or -1 if unknown
- * @param participant
- * the search participant that created the match
- * @param resource
- * the resource of the element, or <code>null</code> if none
- */
- public SearchMatch(Object element, int offset, int length, IFile resource)
- {
- this.object = element;
- this.offset = offset;
- this.length = length;
- this.file = resource;
- }
-
- public IFile getFile()
- {
- return file;
- }
-
- public void setFile(IFile file)
- {
- this.file = file;
- }
-
- public int getLength()
- {
- return length;
- }
-
- public void setLength(int length)
- {
- this.length = length;
- }
-
- // issue (cs/eb) holding objects is a bit odd, since it implies the object's
- // life span
- // is the same as the SearchMatch. What happens when an object is deleted?
- // does the SearchMatch get deleted? Aren't coordinates good enough?
- // at the very least we should document that using this field has some
- // consequences
- /**
- * (eb) see comments for {@link #setObject(Object)}
- */
- public Object getObject()
- {
- return object;
- }
-
- /**
- * @param object
- * Object is an instance of some part of the model that represent
- * the content that was searched. It may require to calculate
- * some additional information that may be required by the tools
- * through {@link #getObject()) (e.g. XML node namespace,
- * nessesary to obtain the prefix for the refactoring tool).
- * <p>
- * There should be no danger here of preventing the object from
- * garbage collection because instances of the search matches
- * supposed to be short lived. {@link SearchMatch} is usually
- * collected by {@link SearchRequestor} which itself is lived for
- * the time of the search and then discarded or re-initialized.
- * Usually the tool that requested a search extracts the
- * information from the collected {@link SearchMatch} and after
- * that {@link SearchMatch} could be garbage collected, releasing
- * object that they hold to.
- * </p>
- */
- public void setObject(Object object)
- {
- this.object = object;
- }
-
- public int getOffset()
- {
- return offset;
- }
-
- public void setOffset(int offset)
- {
- this.offset = offset;
- }
-
- public Object getAdapter(Class adapter)
- {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public Map map = new HashMap();
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchParticipant.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchParticipant.java
deleted file mode 100644
index 95a0446..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchParticipant.java
+++ /dev/null
@@ -1,281 +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.wst.common.core.search;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.core.search.document.SearchDocument;
-import org.eclipse.wst.common.core.search.document.SearchDocumentSet;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-
-/**
- * <p>
- * A search participant describes a particular extension to a generic search
- * mechanism, permitting combined search actions which will involve all required
- * participants.
- * </p>
- * <p>
- * When there is a need to search a document that has some mixed content, then
- * using a one participant will not be enough. E.g. for the searching of the JSP
- * content, a JSP participant needs to create {@link SearchDocument} that
- * contain Java compilation unit and then pass it to the default Java search
- * participant of the Java Search Engine. The same with XML: when there is an
- * XML content that default search participant could not process, but it is
- * required to be search on, a new search participant needs to be defined. That
- * search participant would know how create search document from the content and
- * then it can call default XML search participant.
- * </p>
- * <p>
- * Passing its own {@link SearchRequestor} this participant can then map the
- * match positions back to the original contents, create its own matches and
- * report them to the original requestor.
- * </p>
- * <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 abstract class SearchParticipant implements ISearchOptions
-{
-
- protected static final boolean debugPerf = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.common.core/perf")); //$NON-NLS-1$ //$NON-NLS-2$
-
- protected String id;
- /**
- * Creates a new search participant.
- */
- protected SearchParticipant()
- {
- // do nothing
- }
-
- /**
- * Callback method allowing a search participant to indicate whether it supports
- * the specified search pattern and options.
- * <p>
- * If this method returns <code>true</code>, the participant will participate in
- * finding matches for the search defined by the search pattern. In this case, the
- * search pattern and options will be passed to the following methods of the
- * search participant:
- * <ol>
- * <li>{@link #beginSearching(SearchPattern, Map)}
- * <li>{@link #selectDocumentLocations(SearchPattern, SearchScope, Map, IProgressMonitor)}
- * <li>{@link #createSearchDocuments(SearchDocumentSet, SearchPattern, SearchScope, Map, IProgressMonitor)}
- * <li>{@link #locateMatches(SearchDocumentSet, SearchPattern, SearchScope, SearchRequestor, Map, IProgressMonitor)}
- * <li>{@link #doneSearching(SearchPattern, Map)}
- * </ol>
- * <p>
- * If this method returns <code>false</code>, none of the above methods will be
- * called, and the search participant contributes no matches for the search
- * requrest.
- * <p>
- * A search participant should only participate in a search when in understands
- * the search pattern. Unrecognized search options, however, can be ignored.
- * <p>
- * This method returns <code>false</code> by default. As a result, subclasses must
- * override this method to participate in any searches.
- * @param pattern The pattern describing the information to search for
- * @param searchOptions Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- * @return <code>true</code> if the search participant will participate in the
- * search request; <code>false</code> otherwise
- */
- public abstract boolean isApplicable(SearchPattern pattern, Map searchOptions);
-
- /**
- * Notification that this participant's help is needed in a search.
- * <p>
- * This method should be re-implemented in subclasses that need to do
- * something when the participant is needed in a search.
- * </p>
- * @param pattern The pattern describing the information to search for
- * @param searchOptions Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- */
- public void beginSearching(SearchPattern pattern, Map searchOptions)
- {
- // do nothing
- }
-
- /**
- * Notification that this participant's help is no longer needed.
- * <p>
- * This method should be re-implemented in subclasses that need to do
- * something when the participant is no longer needed in a search.
- * </p>
- * @param pattern
- * The pattern describing the information to search for
- * @param searchOptions
- * Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- */
- public void doneSearching(SearchPattern pattern, Map searchOptions)
- {
- // do nothing
- }
-
- /**
- * Returns a displayable name of this search participant.
- * <p>
- * This method should be re-implemented in subclasses that need to display a
- * meaningfull name.
- * </p>
- *
- * @return the displayable name of this search participant
- */
- public String getDescription()
- {
- return "Search participant"; //$NON-NLS-1$
- }
-
- /**
- * Returns a search document for the given path. The given document path is
- * a string that uniquely identifies the document. Most of the time it is a
- * workspace-relative path, but it can also be a file system path, or a path
- * inside a zip file.
- * <p>
- * Implementors of this method can either create an instance of their own
- * subclass of {@link SearchDocument} or return an existing instance of such
- * a subclass.
- * </p>
- *
- * @param documentPath
- * the path of the document.
- * @return a search document
- */
- public abstract SearchDocument createSearchDocument(String documentPath);
-
- /**
- * Locates the matches in the given documents. This method should be called
- * by the other search participant or search client once it has
- * pre-processed documents and delegating search to this search participant.
- * @param documentSet
- * The documents to locate matches in
- * @param pattern
- * The pattern describing the information to search for
- * @param scope
- * Search scope to limit the source of search candidates;
- * <code>null</code> indicates that the entire workspace is to be
- * searched
- * @param requestor
- * Callback object to notify with the results of the search (each match
- * is reported to {@link SearchRequestor#acceptSearchMatch(SearchMatch)})
- * @param searchOptions
- * Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- * @param monitor
- * Progress monitor used to report work completed; <code>null</code>
- * if no progress needs to be reported
- * @throws CoreException
- * If the requestor had problem accepting one of the matches
- */
- public abstract void locateMatches(SearchDocumentSet documentSet,
- SearchPattern pattern, SearchScope scope,
- SearchRequestor requestor, Map searchOptions, IProgressMonitor monitor)
- throws CoreException;
-
- /**
- *
- * @param document
- * @param pattern
- */
- public abstract void populateSearchDocument(SearchDocument document,
- SearchPattern pattern);
-
- /**
- * Returns the collection of document locations to consider when performing
- * the given search query in the given scope. The search engine calls this
- * method before locating matches.
- * <p>
- * An document location represents a path workspace to the file with the
- * content that has potential matches
- * </p>
- * <p>
- * Clients are not expected to call this method.
- * </p>
- * @param pattern
- * The pattern describing the information to search for
- * @param scope
- * Search scope to limit the source of search candidates;
- * <code>null</code> indicates that the entire workspace is to be
- * searched
- * @param searchOptions
- * Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- * @param monitor
- * Progress monitor used to report work completed; <code>null</code>
- * if no progress needs to be reported
- * @return the collection of document paths to consider
- */
- public SearchScope selectDocumentLocations(SearchPattern pattern,
- SearchScope scope, Map searchOptions, IProgressMonitor monitor)
- {
- return scope;
- }
-
- /**
- * <p>
- * This method calls the following methods for each file in the search scope:
- * <ol>
- * <li>{@link #createSearchDocument(String)}
- * <li>{@link #populateSearchDocument(SearchDocument, SearchPattern)}
- * </ol>
- * @param documentSet
- * The documents to locate matches in
- * @param pattern
- * The pattern describing the information to search for
- * @param scope
- * Search scope to limit the source of search candidates;
- * <code>null</code> indicates that the entire workspace is to be
- * searched
- * @param searchOptions
- * Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- * @param monitor
- * Progress monitor used to report work completed; <code>null</code>
- * if no progress needs to be reported
- */
- public void createSearchDocuments(SearchDocumentSet documentSet,
- SearchPattern pattern, SearchScope scope, Map searchOptions,
- IProgressMonitor monitor)
- {
- Assert.isNotNull(id, "The SearchPartipants id has not been initalized");
- IFile[] files = scope.enclosingFiles();
-
- for (int i = 0; i < files.length; i++)
- {
- String location = files[i].getLocation().toString();
- SearchDocument document = documentSet.getSearchDocument(location, id);
- if(document == null && id != null){
- documentSet.putSearchDocument(id, document = createSearchDocument(location));
- }
- populateSearchDocument(document, pattern);
-
- }
-
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchPlugin.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchPlugin.java
deleted file mode 100644
index cf7a9fc..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchPlugin.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.core.search.internal.SearchParticipantRegistry;
-import org.eclipse.wst.common.core.search.internal.SearchParticipantRegistryReader;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * <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 SearchPlugin extends Plugin implements ISearchOptions
-{
-
- private SearchParticipantRegistry searchParticipantRegistry;
-
- // The shared instance.
- private static SearchPlugin plugin;
-
- /**
- * The constructor.
- */
- public SearchPlugin()
- {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception
- {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SearchPlugin getDefault()
- {
- return plugin;
- }
-
- private SearchParticipantRegistry getSearchParticipantRegistry()
- {
- if (searchParticipantRegistry == null)
- {
- searchParticipantRegistry = new SearchParticipantRegistry();
- new SearchParticipantRegistryReader(searchParticipantRegistry)
- .readRegistry();
- }
- return searchParticipantRegistry;
- }
-
-
- public SearchParticipant getSearchParticipant(String id)
- {
- return getSearchParticipantRegistry().getSearchParticipant(id);
- }
-
- /**
- * Returns the registered search participants that support the specified search
- * pattern and options, loading and creating the search participants if necessary.
- * @param pattern The pattern representing a search request
- * @param searchOptions Map of options and values defining behavior of the search;
- * <code>null</code> if no options are specified;
- * some options and values are provided by {@link ISearchOptions}
- * @return Array of search participants that support the specified search request
- */
- SearchParticipant[] loadSearchParticipants(SearchPattern pattern, Map searchOptions)
- {
- return getSearchParticipantRegistry().getParticipants(pattern, searchOptions);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchRequestor.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchRequestor.java
deleted file mode 100644
index 460b589..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchRequestor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Collects the results from a search engine query. Clients implement a subclass
- * to pass to <code>SearchEngine.search</code> and implement the
- * {@link #acceptSearchMatch(SearchMatch)} method.
- * <p>
- * The subclasses of the SearchRequestor could collected search matches, filter,
- * sort and group them. It's up to the client to pass the required extension of
- * the SearchRequestor to the search engine.
- * </p>
- * <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>
- *
- * @see SearchEngine
- */
-public abstract class SearchRequestor
-{
-
- /**
- * Accepts the given search match.
- *
- * @param match
- * the found match
- * @throws CoreException
- */
- public abstract void acceptSearchMatch(SearchMatch match)
- throws CoreException;
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentDeclarationEntry.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentDeclarationEntry.java
deleted file mode 100644
index f193937..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentDeclarationEntry.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.document;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-
-/**
- *
- * <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 ComponentDeclarationEntry extends Entry
-{
- QualifiedName metaName;
- QualifiedName name;
-
- public QualifiedName getName()
- {
- return name;
- }
-
- public void setName(QualifiedName name)
- {
- this.name = name;
- }
-
- public QualifiedName getMetaName()
- {
- return metaName;
- }
-
- public void setMetaName(QualifiedName metaName)
- {
- this.metaName = metaName;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentReferenceEntry.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentReferenceEntry.java
deleted file mode 100644
index d532f26..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/ComponentReferenceEntry.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.document;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-
-/**
- *
- * <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 ComponentReferenceEntry extends Entry
-{
- QualifiedName name;
-
- public QualifiedName getName()
- {
- return name;
- }
-
- public void setName(QualifiedName name)
- {
- this.name = name;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/Entry.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/Entry.java
deleted file mode 100644
index acd10a6..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/Entry.java
+++ /dev/null
@@ -1,58 +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.wst.common.core.search.document;
-
-/**
- *
- * <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 Entry
-{
- String key;
- String category;
-
- public Entry()
-{
- super();
-
-}
-
- public String getCategory()
- {
- return category;
- }
-
-
-
- public String getKey()
- {
- return key;
- }
-
- public void setCategory(String category)
- {
- this.category = category;
- }
-
- public void setKey(String key)
- {
- this.key = key;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/FileReferenceEntry.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/FileReferenceEntry.java
deleted file mode 100644
index 2789503..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/FileReferenceEntry.java
+++ /dev/null
@@ -1,58 +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.wst.common.core.search.document;
-
-/**
- * <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 FileReferenceEntry extends Entry
-{
- String relativeFilePath;
- String resolvedURI;
- String publicIdentifier;
-
- public String getPublicIdentifier()
- {
- return publicIdentifier;
- }
-
- public void setPublicIdentifier(String publicIdentifier)
- {
- this.publicIdentifier = publicIdentifier;
- }
-
- public String getRelativeFilePath()
- {
- return relativeFilePath;
- }
-
- public void setRelativeFilePath(String relativeFilePath)
- {
- this.relativeFilePath = relativeFilePath;
- }
-
- public String getResolvedURI()
- {
- return resolvedURI;
- }
-
- public void setResolvedURI(String resolvedURI)
- {
- this.resolvedURI = resolvedURI;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocument.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocument.java
deleted file mode 100644
index d9bfcb9..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocument.java
+++ /dev/null
@@ -1,119 +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.wst.common.core.search.document;
-
-import org.eclipse.wst.common.core.search.SearchParticipant;
-
-/**
- * A search document encapsulates a content to be searched in. A search
- * participant creates a search document based on the file locations to locate
- * matches.
- * <p>
- * This class is intended to be subclassed by clients.
- * </p>
- * issue (cs/eb) does a search participant always create a SearchDocument?
- *
- * <p>
- * SearchParticipant or search client create search documents for the search
- * pass where precise locations of the matches will be determined by calling
- * {@link SearchParticipan#locateMatches}
- * </p>
- * <p>
- * SearchParticipant knows how to create search document that it can process.
- * </p>
- * <p>
- * The intent of the separation of the {@link SearchDocument} from the
- * {@link SearchParticipant} is to enable the other search participants to
- * process parts of the document. For example, if XML document has a fragment
- * that it can not process, e.g. Java, then XML participant would create
- * SearchDocument for that fragment which contains Java compilation unit, and
- * pass it to the Java search participant. Passing its own
- * {@link org.eclipse.wst.common.core.search.SearchRequestor} this participant can then map the match positions
- * back to the original contents, create its own matches and report them to the
- * original requestor.
- * </p>
- * <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>
- *
- * @see SearchParticipant
- */
-public abstract class SearchDocument
-{
-
- private String documentPath;
- private SearchParticipant participant;
-
- /**
- * Creates a new search document. The given document path is a string that
- * uniquely identifies the document. Most of the time it is a
- * workspace-relative path, but it can also be a file system path, or a path
- * inside a zip file.
- *
- * @param documentPath
- * the path to the document, or <code>null</code> if none
- */
- protected SearchDocument(String documentPath, SearchParticipant participant)
- {
- this.documentPath = documentPath;
- this.participant = participant;
- }
-
- public abstract Entry[] getEntries(String category, String key, int matchRule);
-
- /**
- * Returns the model of this document. Model may be different from actual
- * resource at corresponding document path due to preprocessing.
- * <p>
- * This method must be implemented in subclasses.
- * </p>
- *
- * @return the model of this document, or <code>null</code> if none
- */
- public abstract Object getModel();
-
-
- /**
- * Returns the participant that created this document.
- *
- * @return the participant that created this document
- */
- public final SearchParticipant getParticipant() {
- return this.participant;
- }
-
-
-// this class represents a collection of information
-// that has been produced by a search participant
-// typically after a file has been processed
-// an Entry is typically course grained info that results from the SearchParticipants
-// first step ... and is used to compute more accurate SearchMatches during a SearchParticipants 2nd step
-
- /**
- * Returns the path to the original document.
- *
- * @return the path to the document
- */
- public final String getPath()
- {
- return this.documentPath;
- }
-
- public abstract void putEntry(Entry entry);
-
- public void dispose()
- {
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocumentSet.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocumentSet.java
deleted file mode 100644
index 42fb34c..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/document/SearchDocumentSet.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.document;
-
-/**
- * The class is used to manage a set of search documents
- * that have been constructed by various participants
- *
- * <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 abstract class SearchDocumentSet
-{
- public abstract SearchDocument getSearchDocument(String resourcePath, String participantId);
- public abstract SearchDocument[] getSearchDocuments(String participantId);
- public abstract void putSearchDocument(String participantId, SearchDocument document);
- public abstract SearchDocument _tempGetSearchDocumetn(String resourcePath);
- public abstract void dispose();
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/Messages.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/Messages.java
deleted file mode 100644
index cc3522b..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/Messages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-// issue (cs) is this a UI issue? where does the framework need to expose stings?
-public class Messages extends NLS
-{
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.common.core.internal.messages";//$NON-NLS-1$
-
- public static String engine_searching;
-
- public static String engine_searching_locatingDocuments;
-
- public static String engine_searching_matching;
-
- private Messages()
- {
- // Do not instantiate
- }
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchDocumentSetImpl.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchDocumentSetImpl.java
deleted file mode 100644
index e3f6c33..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchDocumentSetImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.common.core.search.document.SearchDocument;
-import org.eclipse.wst.common.core.search.document.SearchDocumentSet;
-
-public class SearchDocumentSetImpl extends SearchDocumentSet
-{
- public Map documentPathMap = new HashMap(); //path --> documetn
- Map documentMap = new HashMap(); // participantId - > list (document)
-
- public SearchDocumentSetImpl()
- {
- super();
- }
-
- public SearchDocument _tempGetSearchDocumetn(String resourcePath)
- {
- return (SearchDocument)documentPathMap.get(resourcePath);
- }
-
- public SearchDocument getSearchDocument(String resourcePath, String participantId)
- {
- if(resourcePath == null){
- return null;
- }
- SearchDocument[] documents = getSearchDocuments(participantId);
- for (int i = 0; i < documents.length; i++)
- {
- SearchDocument document = documents[i];
- if(resourcePath.equals(document.getPath())){
- return document;
- }
- }
- return null;
- }
-
- public SearchDocument[] getSearchDocuments(String participantId)
- {
-
- Object object = documentMap.get(participantId);
- List documentList = null;
- if(object instanceof List){
- documentList = (List)object;
- }
- else{
- documentMap.put(participantId, documentList = new ArrayList());
- }
- return (SearchDocument[]) documentList.toArray(new SearchDocument[documentList.size()]);
-
- }
-
- public void putSearchDocument(String participantId, SearchDocument document)
- {
- Object object = documentMap.get(participantId);
- List documentList = null;
- if(object instanceof List){
- documentList = (List)object;
- }
- else{
- documentMap.put(participantId, documentList = new ArrayList());
- }
- documentList.add(document);
- documentPathMap.put(document.getPath(), document);
- }
-
-
- public void dispose()
- {
- try
- {
- for (Iterator i = documentMap.values().iterator(); i.hasNext(); )
- {
- Object o = i.next();
- if (o instanceof List)
- {
- for (Iterator j = ((List)o).iterator(); j.hasNext(); )
- {
- Object o2 = j.next();
- if (o2 instanceof SearchDocument)
- {
- SearchDocument searchDocument = (SearchDocument)o2;
- searchDocument.dispose();
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantDescriptor.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantDescriptor.java
deleted file mode 100644
index 8e39e12..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantDescriptor.java
+++ /dev/null
@@ -1,89 +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.wst.common.core.search.internal;
-
-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.expressions.IEvaluationContext;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.core.search.SearchParticipant;
-
-public class SearchParticipantDescriptor
-{
-
- private IConfigurationElement fElement;
-
- private SearchParticipant participant;
-
- public SearchParticipantDescriptor(IConfigurationElement element)
- {
- this.fElement = element;
- }
-
- public SearchParticipant getSearchParticipant()
- {
- if (participant == null)
- {
- try
- {
- participant = (SearchParticipant) fElement
- .createExecutableExtension("class"); //$NON-NLS-1$
- } catch (Exception e)
- {
- // e.printStackTrace();
- }
- }
- return participant;
- }
-
- public boolean matches(IEvaluationContext context) throws CoreException
- {
- IConfigurationElement[] elements = fElement
- .getChildren(ExpressionTagNames.ENABLEMENT);
- if (elements.length == 0)
- return false;
- Assert.isTrue(elements.length == 1);
- Expression exp = ExpressionConverter.getDefault().perform(elements[0]);
- return convert(exp.evaluate(context));
- }
-
- private boolean convert(EvaluationResult eval)
- {
- if (eval == EvaluationResult.FALSE)
- return false;
- return true;
- }
-
- /**
- * @deprecated No replacement
- */
- public String[] getSupportedContentTypes()
- {
- return new String[0];
- }
-
- /**
- * @deprecated No replacement
- */
- public void addSupportedContentTypeId(String contentTypeId)
- {
- }
-
- public String getElementId(){
- return fElement.getAttribute("id");
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistry.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistry.java
deleted file mode 100644
index a169e91..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistry.java
+++ /dev/null
@@ -1,116 +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.wst.common.core.search.internal;
-
-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.Set;
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.core.search.SearchParticipant;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-
-public class SearchParticipantRegistry
-{
-
- protected Map idMap = new HashMap(); // maps searchParticipant id to a
- // searchParticipant descriptor
-
- public SearchParticipantRegistry()
- {
- }
-
- public void putSearchParticipant(String id,
- SearchParticipantDescriptor searchParticipantDescriptor)
- {
- idMap.put(id, searchParticipantDescriptor);
- }
-
- public String[] getSearchParticipantIds()
- {
- Set ids = idMap.keySet();
- return (String[]) ids.toArray(new String[ids.size()]);
- }
-
- public Collection getSearchParticipants()
- {
- return idMap.values();
- }
-
-
- public SearchParticipant getSearchParticipant(String id)
- {
- SearchParticipantDescriptor searchParticipantDescriptor = null;
- if (id != null)
- {
- searchParticipantDescriptor = (SearchParticipantDescriptor) idMap
- .get(id);
- }
- return searchParticipantDescriptor != null ? searchParticipantDescriptor
- .getSearchParticipant()
- : null;
-
- }
-
- public SearchParticipant[] getParticipants(SearchPattern pattern, Map searchOptions)
- {
-
- EvaluationContext evalContext = createEvaluationContext(pattern);
- List result = new ArrayList();
- for (Iterator iter = getSearchParticipants().iterator(); iter.hasNext();)
- {
- SearchParticipantDescriptor descriptor = (SearchParticipantDescriptor) iter
- .next();
- try
- {
- if (descriptor.matches(evalContext))
- {
- try
- {
- SearchParticipant participant = descriptor
- .getSearchParticipant();
- if (!SearchParticipant.class.isInstance(participant))
- throw new ClassCastException();
- if (participant.isApplicable(pattern, searchOptions))
- {
- result.add(participant);
- }
- } catch (ClassCastException e)
- {
- iter.remove();
- }
- }
-
- } catch (CoreException e)
- {
- iter.remove();
- }
-
- }
-
- return (SearchParticipant[]) result
- .toArray(new SearchParticipant[result.size()]);
- }
-
- private static EvaluationContext createEvaluationContext(
- SearchPattern pattern)
- {
- EvaluationContext result = new EvaluationContext(null, pattern);
- result.addVariable("pattern", pattern); //$NON-NLS-1$
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistryReader.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistryReader.java
deleted file mode 100644
index 7757ce3..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/SearchParticipantRegistryReader.java
+++ /dev/null
@@ -1,69 +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.wst.common.core.search.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-public class SearchParticipantRegistryReader
-{
- protected static final String EXTENSION_POINT_ID = "searchParticipants"; //$NON-NLS-1$
-
- protected static final String TAG_NAME = "searchParticipant"; //$NON-NLS-1$
-
- protected static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- protected static final String ATT_ID = "id"; //$NON-NLS-1$
-
- protected String pluginId, extensionPointId;
-
- protected SearchParticipantRegistry registry;
-
- public SearchParticipantRegistryReader(SearchParticipantRegistry registry)
- {
- this.registry = registry;
- }
-
- public void readRegistry()
- {
- String bundleid = "org.eclipse.wst.common.core"; //$NON-NLS-1$
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(bundleid, EXTENSION_POINT_ID);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- readElement(elements[i]);
- }
- }
- }
-
- protected void readElement(IConfigurationElement element)
- {
- if (element.getName().equals(TAG_NAME))
- {
- String contributorClass = element.getAttribute(ATT_CLASS);
- String id = element.getAttribute(ATT_ID);
- if (id != null)
- {
- if (contributorClass != null)
- {
- SearchParticipantDescriptor descriptor = new SearchParticipantDescriptor(
- element);
- registry.putSearchParticipant(id, descriptor);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties
deleted file mode 100644
index e3a01a8..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/internal/messages.properties
+++ /dev/null
@@ -1,15 +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
-###############################################################################
-### Search messages.
-
-engine_searching = Searching...
-engine_searching_locatingDocuments = {0}: locate search documents...
-engine_searching_matching = {0}: locate matches...
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentDeclarationPattern.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentDeclarationPattern.java
deleted file mode 100644
index 16f3ffe..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentDeclarationPattern.java
+++ /dev/null
@@ -1,40 +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.wst.common.core.search.pattern;
-
-/**
- *
- * <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 ComponentDeclarationPattern extends ComponentSearchPattern
-{
-
- public ComponentDeclarationPattern(QualifiedName name,
- QualifiedName metaName, int matchRule)
- {
- super(null, name, metaName, matchRule);
-
- }
-
- public ComponentDeclarationPattern(QualifiedName name,
- QualifiedName metaName)
- {
- super(null, name, metaName);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentReferencePattern.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentReferencePattern.java
deleted file mode 100644
index 2f1e101..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentReferencePattern.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.pattern;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- *
- * <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 ComponentReferencePattern extends ComponentSearchPattern
-{
-
- public ComponentReferencePattern(IFile file, QualifiedName elementQName,
- QualifiedName typeQName, int matchRule)
- {
- super(file, elementQName, typeQName, matchRule);
-
- }
-
- public ComponentReferencePattern(IFile file, QualifiedName elementQName,
- QualifiedName typeQName)
- {
- super(file, elementQName, typeQName);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentSearchPattern.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentSearchPattern.java
deleted file mode 100644
index 4741a10..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/ComponentSearchPattern.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.pattern;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * This class defines generic component pattern. Usually there are two types of
- * component search patterns: pattern for component declaration and for
- * component 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 abstract class ComponentSearchPattern extends SearchPattern
-{
-
- QualifiedName name;
-
- QualifiedName metaName;
-
- IFile file; // (optional) location where component is defined
-
- public ComponentSearchPattern(IFile file, QualifiedName elementQName,
- QualifiedName typeQName, int matchRule)
- {
- super(matchRule);
- this.file = file;
- name = elementQName;
- metaName = typeQName;
-
- }
-
- public ComponentSearchPattern(IFile file, QualifiedName elementQName,
- QualifiedName typeQName)
- {
-
- this.file = file;
- name = elementQName;
- metaName = typeQName;
-
- }
-
- public IFile getFile()
- {
- return file;
- }
-
- public QualifiedName getMetaName()
- {
- return metaName;
- }
-
- public QualifiedName getName()
- {
- return name;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/FileReferencePattern.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/FileReferencePattern.java
deleted file mode 100644
index 27c1165..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/FileReferencePattern.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.pattern;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- *
- * <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 FileReferencePattern extends SearchPattern
-{
-
- IFile file;
-
- public FileReferencePattern(IFile file)
- {
- this.file = file;
- }
-
- public FileReferencePattern(IFile file, int matchRule)
- {
- super(matchRule);
- this.file = file;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/QualifiedName.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/QualifiedName.java
deleted file mode 100644
index 0f7ab17..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/QualifiedName.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.core.search.pattern;
-
-/**
- * This data class represents a qualified name, consisting of a local name and a
- * qualifier
- *
- * <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>
- */
-// issue (cs) should this go in the 'matching' package (BTW... rename
-// matching->pattern)
-public class QualifiedName
-{
-
- private String qualifier;
-
- private String name;
-
- private static final String NS_DELIM_1 = "{"; //$NON-NLS-1$
-
- private static final String NS_DELIM_2 = "}"; //$NON-NLS-1$
-
- /**
- * Constructor Creates a qualified name from a namespace and local name.
- *
- * @param namespace
- * @param localName
- */
- public QualifiedName(String namespace, String localName)
- {
-
- super();
-
- this.qualifier = namespace;
- if (namespace != null && namespace.length() == 0)
- {
- this.qualifier = null;
- }
- if (this.qualifier != null && this.qualifier.length() == 0)
- {
- this.qualifier = null;
- }
-
- this.name = localName;
- if (localName != null && localName.length() == 0)
- {
- this.name = null;
- }
-
- }
-
- /**
- * Returns the namespace component of the qualified name.
- *
- * @return The namespace; <code>null</code> if none is specified
- */
- public String getNamespace()
- {
- return this.qualifier;
- }
-
- /**
- * Returns the local name component of the qualified name.
- *
- * @return The local name; <code>null</code> if none is specified
- */
- public String getLocalName()
- {
- return this.name;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj)
- {
- boolean isEqual = false;
- if (this == obj)
- {
- isEqual = true;
- }
- else
- {
- if (obj instanceof QualifiedName)
- {
- QualifiedName that = (QualifiedName) obj;
- isEqual = isMatch(this.getNamespace(), that.getNamespace()) &&
- isMatch(this.getLocalName(), that.getLocalName());
- }
- }
- return isEqual;
- }
-
- protected boolean isMatch(String a, String b)
- {
- return a != null ? a.equals(b) : a == b;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- public int hashCode()
- {
- int hash = 0;
- if (this.qualifier != null)
- {
- hash += this.qualifier.hashCode();
- }
- if (this.name != null)
- {
- hash += this.name.hashCode();
- }
- return hash;
- }
-
- /**
- * Returns a string representation of the qualified name, of the form:
- * {namespace}localname. If no namespace is specified, the string has the
- * form: {}localname. Note that the string format may change in the future.
- *
- * @return The string value
- */
- public String toString()
- {
-
- return appendStrings(new String[]
- { NS_DELIM_1, // {
- this.qualifier, NS_DELIM_2, // }
- this.name });
-
- }
-
- /**
- * Factory-like method to create a QName object from the string form of a
- * QName. The string must have the same format as returned by
- * QName.toString().
- *
- * @param qnameString -
- * String form of a QName
- * @return The created QName object created from the specified string
- * @throws IllegalArgumentException -
- * Missing namespace delimiters
- */
- public static QualifiedName valueOf(String qnameString)
- throws IllegalArgumentException
- {
-
- String namespace = null;
- String localName = null;
- if (qnameString == null || qnameString.length() == 0)
- {
- // Both namespace and local name are null.
- } else if (qnameString.startsWith(NS_DELIM_1))
- {
- // The QName has the notation specifying a namespace.
- int index = qnameString.indexOf(NS_DELIM_2);
- if (index == -1)
- {
- // The end delimiter for the namespace was not found. The QName
- // string
- // is malformed.
- throw new IllegalArgumentException(
- "qnameString = " + qnameString); //$NON-NLS-1$
- }
- namespace = qnameString.substring(1, index);
- localName = qnameString.substring(index + 1);
- } else
- {
- // Assume no namespace is specified and the string is a local name.
- localName = qnameString;
- }
- return new QualifiedName(namespace, localName);
-
- }
-
- /**
- * Creates a single string by appending together an array of strings,
- * skipping null strings.
- *
- * @param strings -
- * Strings to be appended together
- * @return Resulting string
- */
- public static String appendStrings(String[] strings)
- {
-
- String result = null;
- if (strings != null)
- {
- StringBuffer tokenBuffer = new StringBuffer();
- int maxCount = strings.length;
- String string;
- for (int i = 0; i < maxCount; i++)
- {
- string = strings[i];
- if (string != null && string.length() > 0)
- {
- tokenBuffer.append(string);
- }// if
- }// for
- result = tokenBuffer.toString();
- }// if
- return result;
-
- }// appendStrings()
-
-}// class QName
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/SearchPattern.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/SearchPattern.java
deleted file mode 100644
index df0aaf6..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/pattern/SearchPattern.java
+++ /dev/null
@@ -1,85 +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.wst.common.core.search.pattern;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * A search defines how search results are found.
- *
- * This class is intended to be subclassed by clients.
- *
- * <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 abstract class SearchPattern implements IAdaptable
-{
-
- /**
- * Match rule: The search pattern matches the search result only if cases
- * are the same. Can be combined to previous rules, e.g.
- * {@link #R_EXACT_MATCH} | {@link #R_CASE_SENSITIVE}
- */
- public static final int R_CASE_SENSITIVE = 8;
-
- // Rules for pattern matching: (exact, prefix, pattern) [ | case sensitive]
- /**
- * Match rule: The search pattern matches exactly the search result, that
- * is, the source of the search result equals the search pattern.
- */
- public static final int R_EXACT_MATCH = 0;
-
- /**
- * Match rule: The search pattern contains one or more wild cards ('*')
- * where a wild-card can replace 0 or more characters in the search result.
- */
- public static final int R_PATTERN_MATCH = 2;
-
- /**
- * Match rule: The search pattern is a prefix of the search result.
- */
- public static final int R_PREFIX_MATCH = 1;
-
- /**
- * Match rule: The search pattern contains a regular expression.
- */
- public static final int R_REGEXP_MATCH = 4;
-
- private int matchRule;
-
- public SearchPattern()
- {
- this.matchRule = R_EXACT_MATCH | R_CASE_SENSITIVE;
- }
-
- public SearchPattern(int matchRule)
- {
- this.matchRule = matchRule;
-
- }
-
- public final int getMatchRule()
- {
- return this.matchRule;
- }
-
- public Object getAdapter(Class adapter)
- {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ContentTypeSearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ContentTypeSearchScope.java
deleted file mode 100644
index c67af17..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ContentTypeSearchScope.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-
-/**
- * Scope that has filterers files based on content types. It can limit other
- * scopes with the given file content types.
- *
- * <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 ContentTypeSearchScope extends SearchScopeImpl
-{
-
- private List validContentIds = new ArrayList();
-
- public ContentTypeSearchScope(SearchScope scope, String[] validContentTypes)
- {
- if (validContentTypes != null)
- {
- for (int i = 0; i < validContentTypes.length; i++)
- {
- this.validContentIds.add(validContentTypes[i]);
- }
- }
- if (scope.enclosingFiles() != null)
- {
- for (int i = 0; i < scope.enclosingFiles().length; i++)
- {
- IFile file = (IFile) scope.enclosingFiles()[i];
- acceptFile(file);
- }
- }
-
- }
-
- protected boolean acceptFile(IFile file)
- {
-
- if (file == null)
- {
- return false;
- } else
- {
- try
- {
- IContentDescription description = file.getContentDescription();
- if (description != null)
- {
- IContentType contentType = description.getContentType();
- if (contentType != null)
- {
- // TODO use IContentType.isKindOf
- for (Iterator iter = validContentIds.iterator(); iter
- .hasNext();)
- {
- String contentId = (String) iter.next();
- IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
- IContentType supportedContentType = contentTypeManager.getContentType(contentId);
- if (supportedContentType != null)
- {
- if (contentType.isKindOf(supportedContentType))
- {
- files.add(file);
- projects.add(file.getProject());
- return true;
- }
- }
-
- }
-
- }
- }
- } catch (CoreException e)
- {
- // ignore the file
- }
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ProjectSearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ProjectSearchScope.java
deleted file mode 100644
index 12ace71..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/ProjectSearchScope.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-
-/**
- *
- * <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 ProjectSearchScope extends SearchScopeImpl
-{
-
- /**
- * Creates a scope that ecloses workspace path and eclosing project
- *
- * @param workspacePath -
- * path to the resource in the workspace, e.g.
- * /MyProject/MyFile.xml
- */
- public ProjectSearchScope(IPath workspacePath)
- {
- super();
- initialize(workspacePath);
-
- }
-
- protected void initialize(IPath workspacePath)
- {
- IResource resource = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(workspacePath);
- if (resource != null)
- {
- IProject project = resource.getProject();
- traverseContainer(project);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScope.java
deleted file mode 100644
index 1dd3efd..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScope.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * A <code>SearchScope</code> defines where search result should be found by a
- * <code>SearchEngine</code> (e.g. project, workspace).
- *
- * Clients must pass an instance of this class to the <code>search(...)</code>
- * methods. Such an instance can be created using the following factory methods
- * on <code>SearchScope</code>: <code>newSearchScope(IResource[])</code>,
- * <code>newWorkspaceScope()</code>
- *
- * The default implementaion of the search scope has no filter, and at creation
- * does not contain any files, It could accept any workspace file.
- *
- * <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 abstract class SearchScope
-{
- /**
- * Returns the path to the workspace files that belong in this search scope.
- * (see <code>IResource.getFullPath()</code>). For example,
- * /MyProject/MyFile.txt
- *
- * @return an array of files in the workspace that belong to this scope.
- */
- public abstract IFile[] enclosingFiles();
-
-
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScopeImpl.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScopeImpl.java
deleted file mode 100644
index 33c4c69..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SearchScopeImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- *
- * <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 SearchScopeImpl extends SearchScope
-{
-
- protected List files = new ArrayList();
-
- protected HashSet projects = new HashSet();
-
- public SearchScopeImpl()
- {
- super();
- }
-
- /**
- * Checks whether the resource at the given path is belongs to this scope.
- * Resource path could be added to the scope, if scope conditions are met.
- * if {@link ISearchScope.encloses(String resourcePath)} returns false and
- * then this method is called and returns true, next call to
- * {@link ISearchScope.eclipses(String resourcePath)} should return true.
- *
- * @param file -
- * workspace file
- * @return whether the resource is enclosed by this scope
- */
- protected boolean acceptFile(IFile file)
- {
- if (file == null)
- {
- return false;
- }
- files.add(file);
- projects.add(file.getProject());
- return true;
-
- }
-
- /**
- * Checks whether the resource at the given path is enclosed by this scope.
- *
- * @param resourcePath -
- * workspace relative resource path
- * @return whether the resource is enclosed by this scope
- */
- protected boolean encloses(String resourcePath)
- {
- IResource resource = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(resourcePath);
- if (resource == null)
- return false;
- return (files.contains(resource));
- }
-
- /**
- * Returns the path to the workspace files that belong in this search scope.
- * (see <code>IResource.getFullPath()</code>). For example,
- * /MyProject/MyFile.txt
- *
- * @return an array of files in the workspace that belong to this scope.
- */
- public IFile[] enclosingFiles()
- {
- if (files == null)
- return new IFile[0];
- return (IFile[]) files.toArray(new IFile[files.size()]);
- }
-
- /**
- * Returns the paths to the enclosing projects for this search scope. (see
- * <code>IResource.getFullPath()</code>). For example, /MyProject
- *
- * @return an array of paths to the enclosing projects.
- */
- protected IProject[] enclosingProjects()
- {
-
- return (IProject[]) projects.toArray(new IProject[projects.size()]);
-
- }
-
- protected void traverseContainer(IContainer container)
- {
-
- IResourceVisitor visitor = new IResourceVisitor()
- {
- public boolean visit(IResource resource)
- {
- if (resource.getType() == IResource.FILE)
- acceptFile((IFile) resource);
- return true;
- }
- };
- try
- {
- container.accept(visitor);
- } catch (CoreException e)
- {
- // ignore resource
- }
-
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SelectionSearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SelectionSearchScope.java
deleted file mode 100644
index 4ffcd3e..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/SelectionSearchScope.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-
-/**
- * <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 SelectionSearchScope extends SearchScopeImpl
-{
-
- protected IResource[] resources;
-
- /**
- * Creates a scope that ecloses workspace path and eclosing project
- *
- * @param workspacePath -
- * path to the resource in the workspace, e.g.
- * /MyProject/MyFile.xml
- */
- public SelectionSearchScope(IResource[] resources)
- {
- super();
- this.resources = resources;
- initialize();
-
- }
-
- protected void initialize()
- {
- if (resources == null)
- return;
- for (int index = 0; index < resources.length; index++)
- {
- IResource resource = resources[index];
- if (resource != null)
- {
- if (resource.getType() == IResource.FOLDER)
- {
- traverseContainer((IFolder) resource);
- } else if (resource.getType() == IResource.FILE)
- {
- acceptFile((IFile) resource);
- }
- }
-
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkingSetSearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkingSetSearchScope.java
deleted file mode 100644
index cab1a19..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkingSetSearchScope.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.common.core.search.scope;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * This class is required to wrap the content of an IWorkingSet.
- * We can't use IWorkingSet directly because it's part of an eclipse.ui
- * component. Therefore, we need to create this object as a surrogate.
- * <br>
- * Usage: We get the array IAdaptable[] of the IWorkingSet object and use this
- * array as argument for all methods of this class including the constructor.
- */
-public class WorkingSetSearchScope extends SearchScopeImpl{
-
- /**
- * Creates an empty scope when no resources is given.
- */
- public WorkingSetSearchScope(){
- super();
- }
-
- /**
- * Intended to be used with an IWorkingSet
- * <br>
- * For example:
- * <pre>
- * IWorkingSet oneWorkingSet;
- * ...
- * IAdaptable[] elements = oneWorkingSet.getElements();
- * WorkingSetSearchScope scope = new WorkingSetSearchScope(elements);
- * </pre>
- */
- public WorkingSetSearchScope(IAdaptable[] elements)
- {
- super();
- addElementsOfWorkingSet(elements);
- }
-
- /**
- * Intended to be used with an IWorkingSet
- * <br>
- * For example:
- * <pre>
- * WorkingSetSearchScope scope = ..;
- * ...
- * IWorkingSet anotherWorkingSet;
- * IAdaptable[] elements = anotherWorkingSet.getElements();
- * scope.addAWorkingSetToScope(elements);
- * </pre>
- */
- public void addAWorkingSetToScope(IAdaptable[] elements){
- addElementsOfWorkingSet(elements);
- }
-
- private void addElementsOfWorkingSet(IAdaptable[] elements){
- for (int j = 0; j < elements.length; j++){
- IContainer container = (IContainer) elements[j].getAdapter(IContainer.class);
- if ( container != null ){
- traverseContainer(container);
- }
- else{
- IFile aFile = (IFile) elements[j].getAdapter(IFile.class);
- if ( aFile != null)
- acceptFile(aFile);
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkspaceSearchScope.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkspaceSearchScope.java
deleted file mode 100644
index e01c201..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/scope/WorkspaceSearchScope.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.core.search.scope;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * <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 WorkspaceSearchScope extends SearchScopeImpl
-{
-
- protected IResource currentResource;
-
- /**
- * Creates a scope that ecloses workspace path and eclosing project
- *
- * @param workspacePath -
- * path to the resource in the workspace, e.g.
- * /MyProject/MyFile.xml
- */
- public WorkspaceSearchScope()
- {
- super();
- initialize();
-
- }
-
- protected void initialize()
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- traverseContainer(root);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/util/CollectingSearchRequestor.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/util/CollectingSearchRequestor.java
deleted file mode 100644
index d227f93..0000000
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/util/CollectingSearchRequestor.java
+++ /dev/null
@@ -1,58 +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.core.search.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.SearchRequestor;
-
-/**
- * Collects the results returned by a <code>ISearchEngine</code>.
- *
- * <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>
- */
-// issue should you move this to a util package? what does jdt do?
-public class CollectingSearchRequestor extends SearchRequestor
-{
- private ArrayList fFound;
-
- public CollectingSearchRequestor()
- {
- fFound = new ArrayList();
- }
-
- /**
- * @return a List of {@link SearchMatch}es (not sorted)
- */
- public List/* <SearchMatch> */getResults()
- {
- return fFound;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.core.search.internal.provisional.SearchRequestor#acceptSearchMatch(org.eclipse.wst.common.search.internal.provisional.SearchMatch)
- */
- public void acceptSearchMatch(SearchMatch match) throws CoreException
- {
- fFound.add(match);
-
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/.classpath b/plugins/org.eclipse.wst.common.environment/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/plugins/org.eclipse.wst.common.environment/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.environment/.cvsignore b/plugins/org.eclipse.wst.common.environment/.cvsignore
deleted file mode 100644
index 3609926..0000000
--- a/plugins/org.eclipse.wst.common.environment/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.environment/.options b/plugins/org.eclipse.wst.common.environment/.options
deleted file mode 100644
index 07f6325..0000000
--- a/plugins/org.eclipse.wst.common.environment/.options
+++ /dev/null
@@ -1,25 +0,0 @@
-# Debugging options for the org.eclipse.wst.env plugin.
-
-# Turn on debugging master switch for the org.eclipse.wst.common.environment plugin.
-org.eclipse.wst.common.environment/debug=true
-
-# Turn on different tracing level
-org.eclipse.wst.common.environment/trace/info=true
-org.eclipse.wst.common.environment/trace/warning=true
-org.eclipse.wst.common.environment/trace/error=true
-
-# Turn on data flow tracing
-org.eclipse.wst.common.environment/trace/data=true
-
-# Turn on command tracing
-org.eclipse.wst.common.environment/trace/command=true
-
-# Turn on emitter tracing
-org.eclipse.wst.common.environment/trace/emitter=true
-
-# Turn on web service ant tracing
-org.eclipse.wst.common.environment/trace/ws_ant=true
-
-# Turn on web service detailed command engine tracing
-org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine=true
-
diff --git a/plugins/org.eclipse.wst.common.environment/.project b/plugins/org.eclipse.wst.common.environment/.project
deleted file mode 100644
index aa72ec5..0000000
--- a/plugins/org.eclipse.wst.common.environment/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.environment</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.environment/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.environment/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bd896db..0000000
--- a/plugins/org.eclipse.wst.common.environment/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:36 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=warning
-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=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.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.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-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.3
diff --git a/plugins/org.eclipse.wst.common.environment/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.wst.common.environment/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 6e43cd0..0000000
--- a/plugins/org.eclipse.wst.common.environment/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:26 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.wst.common.environment/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.environment/META-INF/MANIFEST.MF
deleted file mode 100644
index e1a84d6..0000000
--- a/plugins/org.eclipse.wst.common.environment/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.environment
-Bundle-Version: 1.0.200.qualifier
-Bundle-Activator: org.eclipse.wst.common.internal.environment.plugin.EnvironmentPlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.environment,
- org.eclipse.wst.common.environment.uri,
- org.eclipse.wst.common.internal.environment.eclipse;x-internal:=true,
- org.eclipse.wst.common.internal.environment.plugin;x-internal:=true,
- org.eclipse.wst.common.internal.environment.relative;x-internal:=true,
- org.eclipse.wst.common.internal.environment.uri.file;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.osgi.util;bundle-version="[3.1.100,3.2.0)"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.environment/about.html b/plugins/org.eclipse.wst.common.environment/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.environment/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.environment/build.properties b/plugins/org.eclipse.wst.common.environment/build.properties
deleted file mode 100644
index 19c4009..0000000
--- a/plugins/org.eclipse.wst.common.environment/build.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties,\
- .options
diff --git a/plugins/org.eclipse.wst.common.environment/plugin.properties b/plugins/org.eclipse.wst.common.environment/plugin.properties
deleted file mode 100644
index c41575f..0000000
--- a/plugins/org.eclipse.wst.common.environment/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName=Enviornment Plug-in
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/Choice.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/Choice.java
deleted file mode 100644
index dcd58e4..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/Choice.java
+++ /dev/null
@@ -1,103 +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.common.environment;
-
-/**
- *
- * This class is used by the IStatusHandler interface.
- * It allows code that is reporting status to specify choices to the user
- * which this reporting code can react to.
- *
- * @since 1.0
- */
-public class Choice {
-
- private char shortcut = ' ';
- private String label = null;
- private String description = null;
-
- /**
- * Constructor for Choice.
- */
- public Choice() {
- }
-
- /**
- * Constructor for Choice.
- * @param shortcut the single letter shortcut for this choice.
- * @param label the label to be displayed to the user for this choice.
- */
- public Choice(char shortcut, String label) {
- this.shortcut = shortcut;
- this.label = label;
- }
-
- /**
- * Constructor for Choice.
- * @param shortcut the single letter shortcut for this choice.
- * @param label the label to be displayed to the user for this choice.
- * @param description the description for this choice.
- */
- public Choice(char shortcut, String label, String description) {
- this.shortcut = shortcut;
- this.label = label;
- this.description = description;
- }
-
- /**
- * Gets the label.
- * @return Returns a String
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Sets the label.
- * @param label The label to set
- */
- public void setLabel(String label) {
- this.label = label;
- }
-
- /**
- * Gets the description.
- * @return Returns a String
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the description.
- * @param description The description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Gets the shortcut.
- * @return Returns a char
- */
- public char getShortcut() {
- return shortcut;
- }
-
- /**
- * Sets the shortcut.
- * @param shortcut The shortcut to set
- */
- public void setShortcut(char shortcut) {
- this.shortcut = shortcut;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentException.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentException.java
deleted file mode 100644
index 3d32d38..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentException.java
+++ /dev/null
@@ -1,60 +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.wst.common.environment;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This is the exception class for conditions raised by the IEnvironment.
- *
- * @since 1.0
- */
-public class EnvironmentException extends Exception
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3978983275899402036L;
-
- /**
- * The status for this exception.
- */
- protected IStatus status = null;
-
- /**
- * Creates a new EnvironmentException.
- */
- public EnvironmentException ()
- {
- super();
- }
-
- /**
- * Creates a new EnvironmentException.
- *
- * @param status the status for this exception.
- */
- public EnvironmentException ( IStatus status )
- {
- super(status == null ? null : status.getMessage());
- this.status = status;
- }
-
- /**
- * Returns the Status object.
- *
- * @return the status for this exception.
- */
- public IStatus getStatus()
- {
- return status;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
deleted file mode 100644
index 5663fec..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/EnvironmentService.java
+++ /dev/null
@@ -1,89 +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.environment;
-
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.internal.environment.eclipse.ConsoleEclipseEnvironment;
-
-/**
- *
- * This class creates a console environment. It also contains static
- * conviences methods for creating an ILog object as well as an Eclipse and
- * File Scheme.
- *
- * @since 1.0
- *
- */
-public class EnvironmentService
-{
- static private IEnvironment environment;
-
- /**
- *
- * @return returns an Eclipse console environment.
- */
- public static IEnvironment getEclipseConsoleEnvironment()
- {
- if( environment == null ) environment = new ConsoleEclipseEnvironment();
-
- return environment;
- }
-
- /**
- *
- * @return returns an Eclipse logger.
- */
- public static ILog getEclipseLog()
- {
- IEnvironment environment = getEclipseConsoleEnvironment();
-
- return environment.getLog();
- }
-
- /**
- *
- * @return returns an Eclipse scheme.
- */
- public static IURIScheme getEclipseScheme()
- {
- IEnvironment environment = getEclipseConsoleEnvironment();
- IURIScheme scheme = null;
-
- try
- {
- scheme = environment.getURIFactory().newURIScheme( "platform" );
- }
- catch( URIException exc )
- {
- }
-
- return scheme;
- }
-
- /**
- *
- * @return returns a File scheme.
- */
- public static IURIScheme getFileScheme()
- {
- IEnvironment environment = getEclipseConsoleEnvironment();
- IURIScheme scheme = null;
-
- try
- {
- scheme = environment.getURIFactory().newURIScheme( "file" );
- }
- catch( URIException exc )
- {
- }
-
- return scheme;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IEnvironment.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IEnvironment.java
deleted file mode 100644
index 39503be..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IEnvironment.java
+++ /dev/null
@@ -1,52 +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.wst.common.environment;
-
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-
-
-/**
- * An IEnvironment provides the means for getting a
- * <ol>
- * <li>A log for writing messages to a logging facility,</li>
- * <li>A progress monitor for receiving progress information,</li>
- * <li>A status handler for receiving and processing status reports,</li>
- * <li>A factory for the handling of URIs (resources).</li>
- * </ol>
- *
- * @since 1.0
- */
-public interface IEnvironment
-{
- /**
- * Returns a logging facility.
- *
- * @return returns a logging facility.
- */
- public ILog getLog ();
-
- /**
- * Returns a status handler.
- *
- * @return returns a status handler.
- */
- public IStatusHandler getStatusHandler ();
-
- /**
- * Returns a IURI factory.
- * Hint: Implementers should insure that the Factory they return
- * has a reference to this IEnvironment so that IURI objects can
- * report progress and announce status.
- *
- * @return returns a URI factory.
- */
- public IURIFactory getURIFactory ();
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/ILog.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/ILog.java
deleted file mode 100644
index 291fcab..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/ILog.java
+++ /dev/null
@@ -1,130 +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.common.environment;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * ILog objects provide a means for logging information for FFDC etc.
- *
- * @since 1.0
- */
-public interface ILog
-{
- /**
- * This constant indicates that a logging message is Ok.
- */
- public static final int OK = 0;
-
- /**
- * This constant indicates that a logging message is informational.
- */
- public static final int INFO = 1;
-
- /**
- * This constant indicates that a logging message is warning.
- */
- public static final int WARNING = 2;
-
- /**
- * This constant indicates that a logging message is an error.
- */
- public static final int ERROR = 4;
-
- /**
- * Returns true if logging is enabled.
- * There is no requirement to call this method before attempting
- * a call to one of the <code>log</code> methods, as they will
- * quietly do nothing if logging is disabled. This method can be
- * useful, however, anywhere the cost of building up the parameters
- * to a log method might be high and best avoided except when logging
- * is enabled.
- * @return True if logging is enabled, and false otherwise.
- */
- public boolean isEnabled ();
-
- /**
- * Returns true if this debug option is set to true.
- *
- * @param option this debug option string.
- * @return returns true if this debug option is set to true.
- */
- public boolean isEnabled (String option);
-
- /**
- * Logs a <code>Throwable</code>.
- * @param severity The severity of the logging entry.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param throwable The Throwable to log.
- */
- public void log ( int severity, int messageNum, Object caller, String method, Throwable throwable );
-
- /**
- * Logs a <code>Throwable</code>.
- * @param severity The severity of the logging entry.
- * @param option this debug option string.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param throwable The Throwable to log.
- */
- public void log ( int severity, String option, int messageNum, Object caller, String method, Throwable throwable );
-
- /**
- * Logs a <code>Status</code>.
- * @param severity The severity of the logging entry.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param status The Status to log.
- */
- public void log ( int severity, int messageNum, Object caller, String method, IStatus status );
-
- /**
- * Logs a <code>Status</code>.
- * @param severity The severity of the logging entry.
- * @param option this debug option string.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param status The Status to log.
- */
- public void log ( int severity, String option, int messageNum, Object caller, String method, IStatus status );
-
- /**
- * Logs an <code>Object</code>.
- * @param severity The severity of the logging entry.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param object The Object to log.
- */
- public void log ( int severity, int messageNum, Object caller, String method, Object object );
-
- /**
- * Logs an <code>Object</code>.
- * @param severity The severity of the logging entry.
- * @param option this debug option string.
- * @param messageNum The message number.
- * @param caller The object (for non-static methods) or class (for
- * static methods) doing the logging.
- * @param method The simple name of the method doing the loging.
- * @param object The Object to log.
- */
- public void log ( int severity, String option, int messageNum, Object caller, String method, Object object );
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IStatusHandler.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IStatusHandler.java
deleted file mode 100644
index 4492a99..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/IStatusHandler.java
+++ /dev/null
@@ -1,54 +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.common.environment;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Processes status events raised by the caller and returns an
- * indication of choices made by the recipient of the status and
- * may raise an exception against the caller to have them abort
- * procesing.
- *
- * @since 1.0
- */
-public interface IStatusHandler
-{
- /**
- * Reports the given Status and set of possible responses.
- *
- * @param status the status to report.
- * @param choices the choices that will be displayed to the user.
- * @return returns the choice made by the user/handler.
- */
- public Choice report ( IStatus status, Choice[] choices );
-
- /**
- * Reports the given Status with implied options to either
- * continue or abort.
- * @param status the status to report.
- * @throws StatusException Throws an exception if the handler decides the caller
- * should stop processing.
- */
- public void report ( IStatus status ) throws StatusException;
-
- /**
- * Report the given Error Status. No user feedback is provided.
- * @param status the error status to report.
- */
- public void reportError( IStatus status );
-
- /**
- * Report the given Info Status. No user feedback is provided.
- * @param status the info status to report.
- */
- public void reportInfo( IStatus status );
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/NullStatusHandler.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/NullStatusHandler.java
deleted file mode 100644
index af1f1de..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/NullStatusHandler.java
+++ /dev/null
@@ -1,70 +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.common.environment;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- *
- * This class provides a default implementation of the IStatusHandler interface.
- *
- * @since 1.0
- *
- */
-public class NullStatusHandler implements IStatusHandler
-{
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.core.runtime.IStatus, org.eclipse.env.common.Choice[])
- */
- public Choice report(IStatus status, Choice[] choices)
- {
- Choice result = null;
-
- // Always take the first choice if available.
- if( choices != null && choices.length > 0 )
- {
- result = choices[0];
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.core.runtime.IStatus)
- */
- public void report(IStatus status) throws StatusException
- {
- }
-
- /*
- * Report and error.
- */
- private boolean reportErrorStatus(IStatus status)
- {
- return false;
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IStatusHandler#reportError(org.eclipse.core.runtime.IStatus)
- */
- public void reportError(IStatus status)
- {
- reportErrorStatus( status );
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IStatusHandler#reportInfo(org.eclipse.core.runtime.IStatus)
- */
- public void reportInfo(IStatus status)
- {
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/StatusException.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/StatusException.java
deleted file mode 100644
index b01b8ca..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/StatusException.java
+++ /dev/null
@@ -1,74 +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.wst.common.environment;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This is the exception class used by StatusHandlers to tell their
- * callers that processing should stop.
- *
- * @since 1.0
- */
-public class StatusException extends EnvironmentException
-{
- /**
- * Comment for <code>serialVersionUID</code>
- * */
- private static final long serialVersionUID = 3618141160322119992L;
-
- /**
- * The Choice that lead to the exception being thrown,
- * if any (ie. may be null).
- */
- protected Choice choice;
-
- /**
- * Creates a new StatusException with the given Status.
- * @param status the status for this exception.
- */
- public StatusException( IStatus status )
- {
- super( status );
- }
-
- /**
- * Creates a new StatusException with the given Choice.
- * The Choice may be null.
- * @param choice the choice for this exception.
- */
- public StatusException ( Choice choice )
- {
- super();
- this.choice = choice;
- }
-
- /**
- * Creates a new StatusException with the given Choice
- * and status object. The Choice may be null.
- *
- * @param status the status for this exception.
- * @param choice the choice for this exception.
- */
- public StatusException ( IStatus status, Choice choice )
- {
- super(status);
- this.choice = choice;
- }
-
- /**
- * @return Returns the Choice object inside this exception.
- */
- public Choice getChoice ()
- {
- return choice;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURI.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURI.java
deleted file mode 100644
index 28a63bd..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURI.java
+++ /dev/null
@@ -1,227 +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.wst.common.environment.uri;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-/**
- * A IURI represents a Univeral Resource Identifer.
- *
- * @since 1.0
- */
-public interface IURI
-{
- /**
- * @return Returns the string form of the IURI.
- * The resource need not exist.
- */
- public String toString ();
-
- /**
- * @return Returns the IURIScheme for the scheme of this IURI.
- * The resource need not exist.
- */
- public IURIScheme getURIScheme ();
-
- /**
- * @return Returns true iff the resource identified by this IURI exists.
- */
- public boolean isPresent ();
-
- /**
- * @return Returns true iff the resource identified by this IURI exists
- * and is a leaf. Returns true always for non-hierarchical schemes.
- */
- public boolean isLeaf ();
-
- /**
- * @return Returns true iff the resource identified by this IURI exists
- * and is readable. A readable leaf resource indicates that an
- * input stream can be opened on the resource. A readable folder
- * resource indicates that the children of the folder, if any,
- * can be determined via the list() or visit() methods.
- */
- public boolean isReadable ();
-
- /**
- * @return Returns true iff the resource identified by this IURI exists
- * and is writable. A writable leaf resource indicates that an
- * output stream can be opened on the resource. A writable folder
- * resource indicates that new resources can be created in the folder.
- */
- public boolean isWritable ();
-
- /**
- * @return Returns true iff this IURI belongs to a hierarchical scheme.
- * The resource need not exist.
- * this.isHierarchical() == this.getURIScheme().isHierarchical().
- */
- public boolean isHierarchical ();
-
- /**
- * @return Returns true iff this IURI is a relative IURI.
- * The resource need not exist.
- */
- public boolean isRelative ();
-
- /**
- * @return Returns the IURI of the folder containing this IURI.
- * The resource need not exist.
- * @throws URIException if there is no parent URI.
- */
- public IURI parent () throws URIException;
-
- /**
- * @param relativeURI a relative URI.
- * @return Returns a new, normalized IURI formed by appending the given
- * relative IURI to this IURI. Both URIs must be hierarchical.
- * The resulting IURI will always be hierarchical. The given
- * IURI must be relative. This IURI can be relative or absolute.
- * the resulting IURI will be equivalently relative or absolute.
- * @throws URIException if relativeURI is not relative.
- */
- public IURI append ( IURI relativeURI ) throws URIException;
-
- /**
- * @return Gets an InputStream for reading from the resource
- * identified by this leaf or non-hierarchical IURI.
- *
- * @throws URIException if a stream for this URI can not be created.
- */
- public InputStream getInputStream () throws URIException;
-
- /**
- * @return Gets an OutputStream for writing to the resource
- * identified by this leaf or non-hierarchical IURI.
- * @throws URIException if a stream for this URI can not be created.
- */
- public OutputStream getOutputStream () throws URIException;
-
- /**
- * Creates a new, empty resource at the location identified by
- * the IURI. On completion, this.isLeaf() == true. If a leaf
- * resource already exists, this method does nothing. If a
- * non-leaf resource already exists under this IURI, creation
- * will fail and an exception will be thrown.
- * @throws URIException if an error occurs touching this leaf resource.
- */
- public void touchLeaf () throws URIException;
-
- /**
- * Creates a new folder resource at the location identified by
- * the IURI. The scheme of the IURI must be hierarchical.
- * On completion, this.isLeaf() == false. If a folder resource
- * already exists, this method does nothing. If a leaf resource
- * already exists under this IURI, creation will fail and an
- * exception will be thrown.
- * @throws URIException if an error occurs touching this folder resource.
- */
- public void touchFolder () throws URIException;
-
- /**
- * Erases the resource identified by this IURI.
- * @throws URIException if an error occurs erasing this resource.
- */
- public void erase () throws URIException;
-
- /**
- * Renames or moves the resource identified by this IURI
- * to the new IURI.
- * @param newURI the new URI name for this URI.
- * @throws URIException if an error occurs renaming this resource.
- */
- public void rename ( IURI newURI ) throws URIException;
-
- /**
- * Visits this resource and its decendants in pre-order fashion.
- * For each resource, whether a folder or a leaf, the given
- * IURIVisitor's visit() method is called with the IURI of the
- * resource. If IURIVisitor.visit() returns false, the visiting
- * algorithm will "prune" the decendants of the resource and
- * carry on visiting the rest of the tree. If IURIVisitor.visit()
- * returns true, the visiting algorithm will continue its walk
- * down the resource's descendants.
- * @param uriVisitor the visitor that will be called for each resource visited.
- * @throws URIException if an error occurs visiting this resource and its children.
- */
- public void visit ( IURIVisitor uriVisitor ) throws URIException;
-
- /**
- * As for visit(IURIVisitor), except only resource URIs that are
- * accepted by the given filter are visited. If a folder resource
- * fails to be accepted by the filter, this will not prevent the
- * visiting algorithm from walking the resource's descendants.
- * It remains the job of the visitor to choose whether or not to
- * prune a branch by returning false or true.
- * @param uriVisitor the visitor that will be called for each resource visited.
- * @param uriFilter the resource filter.
- * @throws URIException if an error occurs visiting this resource and its children.
- */
- public void visit ( IURIVisitor uriVisitor, IURIFilter uriFilter ) throws URIException;
-
- /**
- * Returns a list of URIs for the immediate children of the given
- * hierarchical, non-leaf IURI. This method never returns null,
- * though it may return a zero length array.
- * @return returns the children for this URI.
- * @throws URIException if an error occurs locating the children for this URI.
- */
- public IURI[] list () throws URIException;
-
- /**
- * As for list(), except only URIs that are accepted by the given
- * filter are returned in the array. This method never returns null,
- * though it may return a zero length array.
- * @param uriFilter the child filter.
- * @return returns the filtered children for this URI.
- * @throws URIException if an error occurs locating the children for this URI.
- */
- public IURI[] list ( IURIFilter uriFilter ) throws URIException;
-
- /**
- * @return Returns true if the asURL() method is fair game,
- * in other words, if this IURI can be converted into a URL.
- */
- public boolean isAvailableAsURL ();
-
- /**
- * @return Returns a URL object for the resource under this IURI.
- * There are many URIs and URISchemes for which this method
- * will fail and throw an exception. It should be used only
- * in cases where URIs are known to be representable as URLs.
- * @throws URIException if an error occurs returning this URL.
- */
- public URL asURL () throws URIException;
-
- /**
- * @return Returns true if the asFile() method is fair game,
- * in other words, if this IURI can be converted into a File.
- */
- public boolean isAvailableAsFile ();
-
- /**
- * @return Returns a File object for the resource under this IURI.
- * There are many URIs and URISchemes for which this method
- * will fail and throw an exception. It should be used only
- * in cases where URIs are known to be backed by physical files.
- * @throws URIException if an error occurs returning this File.
- */
- public File asFile () throws URIException;
-
- /**
- * @return Returns the IURI as a string.
- * Equivalent to toString().
- */
- public String asString ();
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFactory.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFactory.java
deleted file mode 100644
index 9d8734d..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFactory.java
+++ /dev/null
@@ -1,52 +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.wst.common.environment.uri;
-
-import java.net.URL;
-
-/**
- * This is a factory for creating new IURI and IURIScheme objects.
- *
- * @since 1.0
- */
-public interface IURIFactory
-{
- /**
- * Creates and returns a new IURI for the given string.
- * @param uri the uri to be created.
- * @return the new URI.
- * @throws URIException if the uri parameter is not a valid URI.
- */
- public IURI newURI ( String uri ) throws URIException;
-
- /**
- * Creates and returns a new IURI for the given URL.
- * @param url the url to use to create this URI
- * @return the new URI.
- * @throws URIException if the url parameter is not a valid url.
- */
- public IURI newURI ( URL url ) throws URIException;
-
- /**
- * Creates and returns a new IURIScheme for the given scheme string.
- * If the string contains no colons, the entire string is interpretted
- * as the name of the scheme. If the string contains a colon, then the
- * substring up to but excluding the first colon is interpretted as the
- * name of the scheme, meaning the caller can pass in any IURI string in
- * order to get a IURIScheme object.
- *
- * @param schemeOrURI the scheme or URI from which to create the scheme.
- * @return the new Scheme.
- * @throws URIException if schemeOrUri parameter does not contain
- * a valid scheme or URI name.
- */
- public IURIScheme newURIScheme ( String schemeOrURI ) throws URIException;
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFilter.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFilter.java
deleted file mode 100644
index 5985c2e..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIFilter.java
+++ /dev/null
@@ -1,31 +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.wst.common.environment.uri;
-
-/**
- * This interface is implemented by classes that visit or list URIs.
- * Refer to {@link IURI#getChildren}.
- *
- * @since 1.0
- */
-public interface IURIFilter
-{
- /**
- * Filters the given IURI.
- * @param uri The resource to filter.
- * @return True if the resource matches the filter,
- * false if it does not.
- * @param uri the uri that will be accepted or rejected.
- * @return returns true if this uri is accepted.
- * @throws URIException If the filter fails to analyze the resource.
- */
- public boolean accepts ( IURI uri ) throws URIException;
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIScheme.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIScheme.java
deleted file mode 100644
index 7b87608..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIScheme.java
+++ /dev/null
@@ -1,75 +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.wst.common.environment.uri;
-
-import java.net.URL;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A IURIScheme represents a single scheme for some a family of
- * Univeral Resource Identifiers. Examples include "file", "http"
- * and "platform" (Eclipse).
- *
- * @since 1.0
- */
-public interface IURIScheme
-{
- /**
- * @param uri the URI to be created.
- * @return Returns a new IURI.
- * @throws URIException if the uri specified is not valid or
- * can not be created.
- */
- public IURI newURI ( String uri ) throws URIException;
-
- /**
- * @param url the url used to create the URI.
- * @return Returns a new IURI.
- * @throws URIException if the url specified is not valid or
- * can not be created.
- */
- public IURI newURI ( URL url ) throws URIException;
-
- /**
- * @param uri the URI to be created.
- * @return Returns a new IURI.
- * @throws URIException if the uri specified is not valid or
- * can not be created.
- */
- public IURI newURI ( IURI uri ) throws URIException;
-
- /**
- * @return Returns the proper name of the scheme.
- */
- public String toString ();
-
- /**
- * @return Returns true if and only if this is a hierarchical scheme.
- */
- public boolean isHierarchical ();
-
- /**
- * @param uri the uri to check for validity.
- * @return Returns true if and only if the given IURI satisfies the
- * grammatical requirements of the scheme. Absolute URIs must
- * begin with "<scheme>:". Relative URIs must either not contain
- * a colon, ":", or it must begin with "./".
- */
- public boolean isValid ( IURI uri );
-
- /**
- * @param uri the uri to check for validity.
- * @return Returns a Status object indicating whether or not the given
- * IURI is valid. The severity and message of the Status object
- * will describe this.
- */
- public IStatus validate ( IURI uri );
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIVisitor.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIVisitor.java
deleted file mode 100644
index 586a3d7..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/IURIVisitor.java
+++ /dev/null
@@ -1,29 +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.wst.common.environment.uri;
-
-/**
- * This interface is implemented by classes that visit URIs.
- * Refer to {@link IURI#visit}.
- *
- * @since 1.0
- */
-public interface IURIVisitor
-{
- /**
- * Visits the given IURI.
- * @param uri The resource to visit.
- * @return True if the resource's descendants should be visited,
- * or false if they should not be visited.
- * @throws URIException If the visit method fails.
- */
- public boolean visit ( IURI uri ) throws URIException;
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/SimpleURIFactory.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/SimpleURIFactory.java
deleted file mode 100644
index bccb2e0..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/SimpleURIFactory.java
+++ /dev/null
@@ -1,130 +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.wst.common.environment.uri;
-
-import java.net.URL;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.internal.environment.eclipse.Messages;
-import org.eclipse.wst.common.internal.environment.relative.RelativeScheme;
-
-/**
- *
- * This class provides a default implementation of the IURIFactory interface.
- *
- * @since 1.0
- */
-public class SimpleURIFactory implements IURIFactory
-{
- private Hashtable schemes_ = new Hashtable();
-
- /**
- * @param uri the uri to be created.
- * @return Creates and returns a new IURI for the given string.
- * @throws URIException if an error occurs creating this URI.
- */
- public IURI newURI(String uri) throws URIException
- {
- IURIScheme scheme = newURIScheme( uri, false );
-
- return scheme.newURI( uri );
- }
-
- /**
- * @param url the url to use to create this uri.
- * @return Creates and returns a new IURI for the given URL.
- * @throws URIException if an error occurs creating this URI.
- */
- public IURI newURI(URL url) throws URIException
- {
- IURIScheme scheme = newURIScheme( url.toString(), false );
-
- return scheme.newURI( url );
- }
-
- /**
- * @param schemeOrURI the scheme name or URI from which this scheme is
- * to be created.
- * @return Creates and returns a new IURIScheme for the given scheme string.
- * If the string contains no colons, the entire string is interpretted
- * as the name of the scheme. If the string contains a colon, then the
- * substring up to but excluding the first colon is interpretted as the
- * name of the scheme, meaning the caller can pass in any IURI string in
- * order to get a IURIScheme object.
- * @throws URIException if an error occurs creating this URI scheme.
- */
- public IURIScheme newURIScheme(String schemeOrURI) throws URIException
- {
- return newURIScheme( schemeOrURI, true );
- }
-
- /**
- * This method registers a scheme for a particular protocol.
- *
- * @param protocol the protocol.
- * @param scheme the scheme.
- */
- public void registerScheme( String protocol, IURIScheme scheme )
- {
- schemes_.put( protocol, scheme );
- }
-
- private IURIScheme newURIScheme(String schemeOrURI, boolean checkForScheme ) throws URIException
- {
- IURIScheme newScheme = null;
-
- if( schemeOrURI == null )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_NULL_ARG_SPECIFIED, "newURIScheme"), null ) );
- }
-
- int colon = schemeOrURI.indexOf(':');
- int slash = schemeOrURI.indexOf('/');
-
- // A protocol was specified. Note: a colon appearing after a path is not
- // considered part of the protocol for this IURI.
- if( ( checkForScheme && colon == -1 ) ||
- ( colon != -1 && slash == -1) ||
- ( colon != -1 && colon < slash ) )
- {
- // If colon is -1 then we will treat the entire input parameter as the protocol.
- if( colon == -1 ) colon = schemeOrURI.length();
-
- String protocol = schemeOrURI.substring(0, colon );
- newScheme = (IURIScheme)schemes_.get( protocol );
-
- if( newScheme == null )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_SCHEME_NOT_FOUND, schemeOrURI ), null ) );
-
- }
- }
- else if( schemeOrURI.startsWith( "/") )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_ABSOLUTE_PATH_WITHOUT_SCHEME, schemeOrURI ), null ) );
-
- }
- else
- {
- newScheme = new RelativeScheme();
- }
-
- return newScheme;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/URIException.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/URIException.java
deleted file mode 100644
index ccb7543..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/environment/uri/URIException.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.environment.uri;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This is the base class for most exceptions thrown by IURI classes.
- * Every URIException carries a IURI and a Status, each of which may
- * be null. The getMessage() method as inherited from Exception will
- * return the message from the URIExceptin's Status object, if any.
- *
- * @since 1.0
- */
-public class URIException extends Exception
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3258130271424756018L;
-
- /**
- * A Status object containing details about the exception,
- * if applicable.
- */
- protected IStatus status;
-
- /**
- * The IURI for which the exception occured,
- * if applicable.
- */
- protected IURI uri;
-
- /**
- * Creates a new URIException with the given Status.
- * The status may be null.
- *
- * @param status the staus for this exception.
- */
- public URIException ( IStatus status )
- {
- super();
- this.status = status;
- }
-
- /**
- * Creates a new URIException for the given Status and IURI,
- * each of which may be null.
- *
- * @param status the status for this exception.
- * @param uri the uri that caused this exception.
- */
- public URIException ( IStatus status, IURI uri )
- {
- super(status != null ? status.getMessage() : null);
- this.status = status;
- this.uri = uri;
- }
-
- /**
- * @return returns the Status object inside this exception.
- */
- public IStatus getStatus ()
- {
- return status;
- }
-
- /**
- * @return returns the IURI inside this exception.
- */
- public IURI getURI ()
- {
- return uri;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/ConsoleEclipseEnvironment.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/ConsoleEclipseEnvironment.java
deleted file mode 100644
index 0c9c95e..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/ConsoleEclipseEnvironment.java
+++ /dev/null
@@ -1,67 +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.wst.common.internal.environment.eclipse;
-
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.internal.environment.uri.file.FileScheme;
-
-
-/**
- * This class is intended for use in a headless Eclipse environment.
- */
-public class ConsoleEclipseEnvironment implements IEnvironment
-{
- private SimpleURIFactory uriFactory_ = null;
- private IStatusHandler statusHandler_ = null;
-
- public ConsoleEclipseEnvironment()
- {
- this( new NullStatusHandler() );
- }
-
- public ConsoleEclipseEnvironment( IStatusHandler statusHandler )
- {
- uriFactory_ = new SimpleURIFactory();
- statusHandler_ = statusHandler;
-
- uriFactory_.registerScheme( "platform", new EclipseScheme( this ) );
- uriFactory_.registerScheme( "file", new FileScheme() );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.environment.IEnvironment#getLog()
- */
- public ILog getLog()
- {
- return new EclipseLog();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.environment.IEnvironment#getStatusHandler()
- */
- public IStatusHandler getStatusHandler()
- {
- return statusHandler_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.environment.IEnvironment#getURIFactory()
- */
- public IURIFactory getURIFactory()
- {
- return uriFactory_;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseLog.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseLog.java
deleted file mode 100644
index e1d75e6..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseLog.java
+++ /dev/null
@@ -1,165 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 100364 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.common.internal.environment.eclipse;
-
-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.wst.common.environment.ILog;
-import org.eclipse.wst.common.internal.environment.plugin.EnvironmentPlugin;
-
-public class EclipseLog implements org.eclipse.wst.common.environment.ILog
-{
- private org.eclipse.core.runtime.ILog logger;
-
- public EclipseLog()
- {
- Plugin plugin = EnvironmentPlugin.getInstance();
-
- logger = plugin.getLog();
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#isEnabled()
- */
- public boolean isEnabled()
- {
- return Platform.inDebugMode();
- }
-
- /**
- * @see org.eclipse.wst.common.Environment.ILog#isEnabled(java.lang.String)
- */
- public boolean isEnabled(String option) {
- return "true".equals(Platform.getDebugOption("org.eclipse.wst.common.environment/trace/"
- + option));
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, int messageNum, Object caller,
- String method, Object object)
- {
-
- if (isEnabled()) {
- switch (severity) {
- case ILog.ERROR :
- {
- if (isEnabled("error"))
- {
- String message = getMessageNumString(messageNum) + "E "
- + caller + "::" + method + ": object="
- + object;
- log( severity, message, null );
- }
- break;
- }
-
- case ILog.WARNING :
- {
- if (isEnabled("warning"))
- {
- String message = getMessageNumString(messageNum)
- + "W " + caller + "::" + method
- + ": object=" + object;
- log( severity, message, null );
- }
- break;
- }
-
- case ILog.INFO :
- {
- if (isEnabled("info"))
- {
- String message = getMessageNumString(messageNum) + "I "
- + caller + "::" + method + ": object="
- + object;
- log( severity, message, null );
- }
- break;
- }
- }
- }
-
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, int, java.lang.Object, java.lang.String, org.eclipse.core.runtime.IStatus)
- */
- public void log(int severity, int messageNum, Object caller,
- String method, IStatus status) {
- log(severity, messageNum, caller, method, (Object)status);
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, int messageNum, Object caller,
- String method, Throwable throwable) {
- log( severity, messageNum, caller, method, (Object)null );
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, String option, int messageNum,
- Object caller, String method, Object object)
- {
- if (isEnabled(option))
- {
- String message = getMessageNumString(messageNum) + "I " + caller
- + "::" + method + ": object=" + object;
- log(severity, message, null );
- }
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, String option, int messageNum,
- Object caller, String method, Throwable throwable)
- {
- if (isEnabled(option))
- {
- String message = getMessageNumString(messageNum) + "I " + caller
- + "::" + method;
- log( severity, message, throwable );
- }
- }
-
- /**
- * @see org.eclipse.wst.common.environment.ILog#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.core.runtime.IStatus)
- */
- public void log(int severity, String option, int messageNum,
- Object caller, String method, IStatus status)
- {
- logger.log( status );
- }
-
- private String getMessageNumString(int messageNum) {
- String messageNumString = "IWAB";
- if (messageNum > 9999 || messageNum < 0)
- messageNum = 9999; //default message number
- messageNumString += (new Integer(messageNum)).toString();
- return messageNumString;
- }
-
- private void log( int severity, String message, Throwable exc )
- {
- Status status = new Status( severity, "id", 0, message, exc );
- logger.log( status );
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseScheme.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseScheme.java
deleted file mode 100644
index 0042c4d..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseScheme.java
+++ /dev/null
@@ -1,197 +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.wst.common.internal.environment.eclipse;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.internal.environment.relative.RelativeURI;
-
-
-public class EclipseScheme implements IURIScheme
-{
- private IEnvironment environment_;
-
- public EclipseScheme( IEnvironment environment )
- {
- environment_ = environment;
- }
-
- public String toString()
- {
- return "platform";
- }
-
- /**
- */
- public boolean isHierarchical()
- {
- return true;
- }
-
- /**
- */
- public boolean isValid(IURI uri)
- {
- boolean result = true;
-
- if( uri == null ) return false;
-
- try
- {
- IURIScheme scheme = uri.getURIScheme();
-
- if( scheme.toString().equals( "relative") ) return scheme.isValid( uri );
-
- getPathFromPlatformURI( uri.toString() );
- }
- catch( URIException exc )
- {
- result = false;
- }
-
- return result;
- }
-
- /**
- */
- public IURI newURI(String uri) throws URIException
- {
- String newURI = null;
-
- if( uri != null && uri.startsWith( "platform:") )
- {
- // The platform has been specified so keep it as is.
- newURI = uri;
- }
- else if( uri == null || uri.indexOf( ":") != -1 )
- {
- // The platform uri is not allowed to contain some other protocol.
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_INVALID_PLATFORM_URL,uri), null ) );
-
- }
- else if( uri.startsWith( "/") )
- {
- // The platform scheme has not been specified so we will add it.
- newURI = "platform:/resource" + uri;
- }
-
- if( newURI == null )
- {
- return new RelativeURI( uri );
- }
- else
- {
- return new EclipseURI( newURI, environment_ );
- }
- }
-
- /**
- */
- public IURI newURI(IURI uri) throws URIException
- {
- return newURI( uri == null ? null : uri.toString() );
- }
-
- /**
- */
- public IURI newURI(URL url) throws URIException
- {
- return newURI( url == null ? null : url.toString() );
- }
-
- /**
- */
- public IStatus validate(IURI uri)
- {
- IStatus status = null;
-
- try
- {
- IURIScheme scheme = uri.getURIScheme();
-
- if( scheme.toString().equals( "relative") ) return scheme.validate( uri );
-
- getPathFromPlatformURI( uri.toString() );
- status = Status.OK_STATUS;
- }
- catch( URIException exc )
- {
- status = exc.getStatus();
- }
-
- return status;
- }
-
- /**
- * Gets the "platform:/resource" IPath given a url
- *
- */
- public String getPathFromPlatformURI(String uri) throws URIException
- {
- String resourceFile = null;
- URL url = null;
-
- try
- {
- url = new URL( uri );
- }
- catch( MalformedURLException exc )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_INVALID_PLATFORM_URL, uri ), exc ) );
- }
-
- if( url == null )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_INVALID_PLATFORM_URL, uri ), null ) );
- }
- if( url.getProtocol().equals("platform") )
- {
- String resourceURL = url.getFile();
-
- if (resourceURL.startsWith("/resource"))
- {
- resourceFile = resourceURL.substring(10); // omit the "/resource" portion
- }
- }
- else
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_INVALID_PLATFORM_URL,url.getFile() ), null ) );
- }
-
- return resourceFile;
- }
-
- /**
- *
- * @param absolutePath an absolute IPath
- * @return returns the platform IURI for this path.
- */
- public String getURLFromPath( IPath absolutePath )
- {
- return "platform:/resource" + absolutePath;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseURI.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseURI.java
deleted file mode 100644
index d062a53..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/EclipseURI.java
+++ /dev/null
@@ -1,518 +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.wst.common.internal.environment.eclipse;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.IURIFilter;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.internal.environment.relative.RelativeURI;
-
-
-public class EclipseURI extends RelativeURI
-{
- private IEnvironment environment_;
- private EclipseScheme scheme_;
- private File file_;
-
- public EclipseURI( String uri, IEnvironment environment )
- {
- super( uri );
-
- environment_ = environment;
- scheme_ = new EclipseScheme( environment );
- file_ = getFile();
- }
-
- public String toString()
- {
- return uri_;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#erase()
- */
- public void erase() throws URIException
- {
- try
- {
- IResource file = getResource();
-
- if( file != null && file.exists() )
- {
- if( file instanceof IFile )
- {
- FileResourceUtils.deleteFile( (IFile)file,
- environment_.getStatusHandler() );
- }
- else if( file instanceof IFolder )
- {
- FileResourceUtils.deleteFolder( (IFolder)file,
- environment_.getStatusHandler() );
- }
- }
-
- }
- catch( Exception exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#getInputStream()
- */
- public InputStream getInputStream() throws URIException
- {
- try
- {
- // If a class cast exception is throw it will be propogated as
- // a URIException.
- IFile file = (IFile)getResource();
-
- //call getContents on the eclipse File object
- if( file != null )
- {
- return file.getContents();
- }
- }
- catch( Throwable exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
-
- return null;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#getOutputStream()
- */
- public OutputStream getOutputStream() throws URIException
- {
- // Ensure that the parent folder exists.
- IURI parent = parent();
-
- if( !parent.isPresent() )
- {
- parent().touchFolder();
- }
-
- return getOutStream();
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#getURIScheme()
- */
- public IURIScheme getURIScheme()
- {
- return scheme_;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#isLeaf()
- */
- public boolean isLeaf()
- {
- boolean result = false;
-
- try
- {
- IResource resource = getResource();
-
- if( resource != null &&
- resource.exists() &&
- resource.getType() == IResource.FILE )
- {
- result = true;
- }
- }
- catch( URIException exc )
- {
- // This IURI does not exist.
- result = false;
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#isPresent()
- */
- public boolean isPresent()
- {
- boolean result = false;
-
- try
- {
- IResource resource = getResource();
-
- if( resource != null && resource.exists() )
- {
- result = true;
- }
- }
- catch( URIException exc )
- {
- // This IURI does not exist.
- result = false;
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#isReadable()
- */
- public boolean isReadable()
- {
- boolean result = false;
-
- try
- {
- IResource resource = getResource();
-
- if( resource != null && resource.isAccessible() )
- {
- result = true;
- }
- }
- catch( URIException exc )
- {
- // This IURI does not exist.
- result = false;
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#isRelative()
- */
- public boolean isRelative()
- {
- return false;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#isWritable()
- */
- public boolean isWritable()
- {
- boolean result = false;
-
- try
- {
- IResource resource = getResource();
-
- if( resource != null &&
- resource.isAccessible() &&
- !resource.getResourceAttributes().isReadOnly() )
- {
- result = true;
- }
- }
- catch( URIException exc )
- {
- // This IURI does not exist.
- result = false;
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#list()
- */
- public IURI[] list() throws URIException
- {
- IResource resource = getResource();
- IURI[] uriChildren = new IURI[0];
-
- if( resource.getType() == IResource.FOLDER )
- {
- IFolder folder = (IFolder)resource;
-
- try
- {
- IResource[] children = folder.members();
-
- uriChildren = new IURI[children.length];
-
- for( int index = 0; index < children.length; index++ )
- {
- IPath path = children[index].getFullPath();
- uriChildren[index] = new EclipseURI( scheme_.getURLFromPath(path), environment_ );
- }
- }
- catch( CoreException exc )
- {
- }
- }
-
- return uriChildren;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#list(org.eclipse.env.uri.IURIFilter)
- */
- public IURI[] list(IURIFilter uriFilter) throws URIException
- {
- IResource resource = getResource();
- IURI[] result = new IURI[0];
-
- if( resource.getType() == IResource.FOLDER )
- {
- IFolder folder = (IFolder)resource;
-
- try
- {
- IResource[] children = folder.members();
- Vector uriChildren = new Vector();
-
- for( int index = 0; index < children.length; index++ )
- {
- IPath path = children[index].getFullPath();
- IURI uri = new EclipseURI( scheme_.getURLFromPath(path), environment_ );
-
- if( uriFilter.accepts( uri ) )
- {
- uriChildren.add( uri );
- }
- }
-
- result = (IURI[])uriChildren.toArray( new IURI[0] );
- }
- catch( CoreException exc )
- {
- }
- }
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#rename(org.eclipse.env.uri.IURI)
- */
- public void rename(IURI newURI ) throws URIException
- {
- if( newURI == null || !(newURI instanceof EclipseURI) ) return;
-
- try
- {
- EclipseURI newEclipseURI = (EclipseURI)newURI;
- IPath newPath = new Path( scheme_.getPathFromPlatformURI( newEclipseURI.uri_ ) ).makeAbsolute();
- IResource resource = getResource();
-
- if( resource != null )
- {
- resource.move( newPath, true, null );
- }
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ) );
- }
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#touchFolder()
- */
- public void touchFolder() throws URIException
- {
- IResource resource = getResource();
-
- if( resource != null )
- {
- if( resource.getType() == IResource.FOLDER )
- {
- IFolder folder = (IFolder)resource;
-
- try
- {
- if( folder.members().length > 0 )
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_ERROR_FOLDER_HAS_CHILDREN, folder.toString() ), null ),
- this );
-
- }
- }
- catch( CoreException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
- else
- {
- //??? Not sure what to do if touching a folder and the IURI exists and it is not a folder.
- }
- }
- else
- {
- IPath newPath = new Path( scheme_.getPathFromPlatformURI( uri_ ) ).makeAbsolute();
-
- try
- {
- FileResourceUtils.makeFolderPath( newPath,
- environment_.getStatusHandler() );
- }
- catch( CoreException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#touchLeaf()
- */
- public void touchLeaf() throws URIException
- {
- IResource resource = getResource();
-
- if( resource != null )
- {
- // The resource already exists so do nothing.
- }
- else
- {
- // Get the parent for this leaf and create it if required.
- IURI parent = parent();
-
- if( !parent.isPresent() )
- {
- parent().touchFolder();
- }
-
- try
- {
- // Get an output stream to the specified file and immediately close it.
- // This should create a 0 byte file.
- getOutStream().close();
- }
- catch( IOException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
-
- }
-
- private IResource getResource() throws URIException
- {
- IPath path = new Path( scheme_.getPathFromPlatformURI(uri_) );
- String absolutePathname = path.makeAbsolute().toString();
-
- return FileResourceUtils.findResource(absolutePathname);
- }
-
- /**
- * @see org.eclipse.env.uri.IURI#getOutputStream()
- */
- private OutputStream getOutStream() throws URIException
- {
- IPath file = new Path( scheme_.getPathFromPlatformURI( uri_ ) ).makeAbsolute();
- OutputStream stream = null;
-
- stream = FileResourceUtils.newFileOutputStream ( file,
- environment_.getStatusHandler() );
- return stream;
- }
-
- /**
- * Returns a File object for the resource under this IURI.
- * There are many URIs and URISchemes for which this method
- * will fail and throw an exception. It should be used only
- * in cases where URIs are known to be backed by physical files.
- */
- public File asFile ()
- {
- return file_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.environment.uri.IURI#isAvailableAsFile()
- */
- public boolean isAvailableAsFile()
- {
- return file_ != null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asURL()
- */
- public URL asURL() throws URIException
- {
- URL url = null;
-
- try
- {
- url = new URL( uri_ );
- }
- catch( MalformedURLException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
-
- return url;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isAvailableAsURL()
- */
- public boolean isAvailableAsURL()
- {
- URL theURL = null;
-
- try
- {
- theURL = asURL();
- }
- catch( URIException exc )
- {
- }
-
- return theURL != null ;
- }
-
- private File getFile()
- {
- String platformRes = "platform:/resource";
- File result = null;
-
- if (uri_.startsWith(platformRes))
- {
- result = new File(ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().append(uri_.substring(platformRes.length(), uri_.length())).toString());
- }
-
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceOutputStream.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceOutputStream.java
deleted file mode 100644
index 8cfebb5..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceOutputStream.java
+++ /dev/null
@@ -1,145 +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.common.internal.environment.eclipse;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class defines an output stream that writes to an
-* {@link org.eclipse.core.resources.IFile IFile}.
-*/
-public class FileResourceOutputStream extends OutputStream
-{
-
- IPath fFilePath;
- IStatusHandler fStatusHandler;
- ByteArrayOutputStream fByteArrayOutputStream;
- boolean fOpen;
-
- /**
- * Constructs an output stream that can be used to write to the
- * given <code>file</code>. The workspace is neither examined nor
- * altered during construction. All resource creation is deferred
- * until later in the stream's lifecycle, such as during writing
- * or closure.
- * <b>Note:</b> The preferred mechanism for creating a stream that
- * writes to an IFile is to call the static factory method
- * {@link FileResourceUtils#newFileOutputStream FileResourceUtils.newFileOutputStream()}
- * and work with the resulting <code>OutputStream</code>.
- * Direct construction of a FileResourceOutputStream is not recommended.
- * @param file The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file resource to create. The project implied by the
- * pathname of the file must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- */
- public FileResourceOutputStream (
- IPath filePath,
- IStatusHandler statusHandler
- )
- {
- fFilePath = filePath;
- fStatusHandler = statusHandler;
- fByteArrayOutputStream = new ByteArrayOutputStream();
- fOpen = true;
- }
-
- /**
- * Closes the stream.
- * @throws IOException If an error occurs while closing the stream.
- * For example, if this stream was constructed with overwriteFile = false
- * and a file of the same name already exists, then an IOException will
- * be thrown either now or during an earlier {@link #write write}.
- */
- public void close ()
- throws IOException
- {
- if (!fOpen) return;
- fOpen = false;
- fByteArrayOutputStream.close();
- byte[] buffer = fByteArrayOutputStream.toByteArray();
- ByteArrayInputStream tempInputStream = new ByteArrayInputStream(buffer);
- try
- {
- FileResourceUtils.createFile(fFilePath, tempInputStream, fStatusHandler);
- }
- catch (CoreException e)
- {
- throw new IOException(e.getMessage());
- }
- }
-
- /**
- * Flushes the stream. This does not imply the File resource
- * will be created or become visible within the workbench.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void flush ()
- throws IOException
- {
- fByteArrayOutputStream.flush();
- }
-
- /**
- * Writes all bytes from the given array to the stream.
- * @param b The array of bytes to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( byte[] b )
- throws IOException
- {
- fByteArrayOutputStream.write(b);
- }
-
- /**
- * Writes bytes from the given array beginning at some offset
- * and continuing for some number of bytes (len) to the stream.
- * @param b The array of bytes to write.
- * @param off The offset into the array to begin writing.
- * @param len The number of bytes to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( byte[] b, int off, int len )
- {
- fByteArrayOutputStream.write(b,off,len);
- }
-
- /**
- * Writes a single byte to the stream.
- * @param b The byte to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( int b )
- {
- fByteArrayOutputStream.write(b);
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceUtils.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceUtils.java
deleted file mode 100644
index 240f43f..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/FileResourceUtils.java
+++ /dev/null
@@ -1,550 +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.common.internal.environment.eclipse;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class contains useful methods for working with Eclipse resources.
-*/
-public final class FileResourceUtils
-{
- //
- // Keeps the IWorkspace hanging around. See getWorkspace().
- //
- private static IWorkspace workspace_ = null;
- //
- // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
- //
- private static IWorkspaceRoot root_ = null;
-
- /**
- * Returns the IWorkspaceRoot object.
- * @return The IWorkspaceRoot object.
- */
- public static IWorkspaceRoot getWorkspaceRoot ()
- {
- if (root_ == null)
- {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- return root_;
- }
-
- /**
- * Returns the IWorkspace object.
- * @return The IWorkspace object.
- */
- public static IWorkspace getWorkspace ()
- {
- if (workspace_ == null)
- {
- if (root_ == null)
- {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
-
- workspace_ = root_.getWorkspace();
- }
-
- return workspace_;
- }
-
- /**
- *
- * @return returns an array of three common choices. (ie. Yes, yes all, and cancel )
- */
- public static Choice[] getThreeStateFileOptions()
- {
- Vector choices = new Vector();
-
- choices.add(new Choice( 'Y', Messages.LABEL_YES ));
- choices.add(new Choice( 'A', Messages.LABEL_YES_TO_ALL ));
- choices.add(new Choice( 'C', Messages.LABEL_CANCEL ));
-
- return (Choice[])choices.toArray(new Choice[choices.size()]);
- }
-
- /**
- * Returns an
- * {@link org.eclipse.core.resources.IResource IResource}
- * of the given absolute pathname or null if no such resource exists.
- * @param absolutePathname The absolute path of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource ( String absolutePathname )
- {
- if (absolutePathname == null)
- {
- return null;
- }
-
- return findResource(new Path(absolutePathname));
- }
-
- /**
- * Returns an
- * {@link org.eclipse.core.resources.IResource IResource}
- * of the given absolute path or null if no such resource exists.
- * @param absolutePath The absolute <code>IPath</code> of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource ( IPath absolutePath )
- {
- if (absolutePath == null)
- {
- return null;
- }
-
- return FileResourceUtils.getWorkspaceRoot().findMember(absolutePath);
- }
-
- /**
- * Copies a file from a plugin's installation location
- * to an Eclipse folder.
- * @param plugin The plugin containing the files to copy.
- * Must not be null.
- * @param sourcePath The path, relative to the <code>plugin</code>
- * install location, containing the files to copy.
- * If null, then the plugin install location is the source path
- * (ie. null is equivalent to ".").
- * @param pathname The pathname of the file to copy.
- * The pathname is relative to the <code>plugin sourcePath</code>.
- * Must not be null.
- * @param targetPath The absolute Eclipse path of the folder to
- * which the file will be copied. The relative pathname of the
- * file is preserved.
- * Must not be null.
- * @param createFolders The intermediate folder creation policy, one of
- * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
- * <ul>
- * <li><code>CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, they will be created.
- * <li><code>DONT_CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, the method will throw a <code>CoreException</code>.
- * </ul>
- * @param overwriteFile The policy for existing files, one of
- * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
- * <ul>
- * <li><code>OVERWRITE</code> -
- * If a resource of the same name as the given
- * <code>absolutePath</code> already exists and is a file,
- * it will be replaced.
- * If the resource already exists and it is not a file,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * <li><code>DONT_OVERWRITE</code> -
- * If any resource of the same name as the given
- * <code>absolutePath</code> already exists,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * </ul>
- * @param progressMonitor The progress monitor for the operation, or null.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- static public void copyFile( Plugin plugin,
- IPath sourcePath,
- IPath pathname,
- IPath targetPath,
- IStatusHandler statusMonitor )
- throws CoreException
- {
- try
- {
- IPath target = targetPath.append(pathname);
- IPath source = sourcePath == null ? pathname : sourcePath.append(pathname);
- InputStream input = plugin.openStream(source);
- createFile(target, input, statusMonitor);
- }
- catch (IOException e)
- {
- throw new CoreException(new Status(IStatus.ERROR,
- plugin.getBundle().getSymbolicName(),
- 0,
- Messages.MSG_ERROR_IO,e));
- }
- }
-
- /**
- * Deletes a file under a container.
- * The container must already exist.
- * @param file - the IFile to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the file does not exist or if it exists and is successfully deleted. False otherwise.
- */
- public static boolean deleteFile( IFile file,
- IStatusHandler statusMonitor)
- throws CoreException
- {
- if (file.exists())
- {
- //We have permission to overwrite so check if file is read-only
- if (file.isReadOnly())
- {
- IFile[] files = new IFile[1];
- files[0] = file;
- IStatus status = getWorkspace().validateEdit(files, null);
-
- if( status.getSeverity() == IStatus.ERROR )
- {
- statusMonitor.reportError( status );
- return false;
- }
- }
-
- file.delete(true, null);
- }
- //At this point, either the file did not exist or we successfully deleted
- // it. Return success.
- return true;
- }
-
- /**
- * Deletes a folder under a container.
- * @param folder - the IFolder to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the folder does not exist or if it exists and is successfully deleted along with its members. False otherwise.
- */
- public static boolean deleteFolder( IFolder folder,
- IStatusHandler statusMonitor )
- throws CoreException
- {
- if (!folder.exists()) return true;
-
- boolean deleted = true;
- IResource[] resources = folder.members();
-
- for (int i=0; i<resources.length; i++)
- {
- IResource resource = resources[i];
- if (resource instanceof IFile)
- {
- deleted = deleteFile((IFile)resource, statusMonitor);
- }
- if (resource instanceof IFolder)
- {
- deleted = deleteFolder( (IFolder)resource, statusMonitor);
- }
-
- if( !deleted ) break;
- }
-
- if( deleted )
- {
- folder.delete(true, true, null);
- return true;
- }
- else
- return false;
- }
-
- /**
- * Creates a file of the given <code>absolutePath</code>
- * and returns its handle as an <code>IFile</code>.
- * If the file cannot be created, a
- * <code>CoreException</code> containing an
- * <code>IStatus</code> object is thrown.
- * @param absolutePath The absolute path of the file to create.
- * The project at the beginning of the path must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- public static IFile createFile (
- IPath absolutePath,
- InputStream inputStream,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (!absolutePath.isAbsolute())
- {
- throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0, NLS.bind( Messages.MSG_ERROR_PATH_NOT_ABSOLUTE, absolutePath.toString() ),null));
- }
- if (absolutePath.segmentCount() < 1)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind( Messages.MSG_ERROR_PATH_EMPTY, absolutePath.toString() ),null));
- }
- if (absolutePath.segmentCount() < 2)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind( Messages.MSG_ERROR_PATH_NOT_FOLDER, absolutePath.toString() ),null));
- }
- IContainer parent = makeFolderPath(absolutePath.removeLastSegments(1), statusHandler);
- String fileName = absolutePath.lastSegment();
-
- return makeFile(parent, fileName, inputStream, statusHandler);
- }
-
- /**
- * Creates under the given <code>project</code>
- * a file of the given <code>relativePath</code>
- * and returns its handle as an <code>IFile</code>.
- * If the file cannot be created, a
- * <code>CoreException</code> containing an
- * <code>IStatus</code> object is thrown.
- * @param absolutePath The absolute path of the file to create.
- * The project at the beginning of the path must already exist,
- * that is, this method cannot be used to create projects.
- * @param createFolders The intermediate folder creation policy, one of
- * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
- * <ul>
- * <li><code>CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, they will be created.
- * <li><code>DONT_CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, the method will throw a <code>CoreException</code>.
- * </ul>
- * @param overwriteFile The policy for existing files, one of
- * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
- * <ul>
- * <li><code>OVERWRITE</code> -
- * If a resource of the same name as the given
- * <code>absolutePath</code> already exists and is a file,
- * it will be replaced.
- * If the resource already exists and it is not a file,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * <li><code>DONT_OVERWRITE</code> -
- * If any resource of the same name as the given
- * <code>absolutePath</code> already exists,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * </ul>
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- public static IFile createFile (
- IProject project,
- IPath relativePath,
- InputStream inputStream,
- IStatusHandler statusMonitor )
-
- throws CoreException
- {
- IPath absolutePath = project.getFullPath().append(relativePath);
- return createFile(absolutePath, inputStream, statusMonitor);
- }
-
- /**
- * Creates an output stream that can be used to write to the
- * given <code>file</code>. Actual changes to the workspace
- * may occur during creation of the stream, while writing to
- * the stream, or when the stream is closed.
- * A <code>CoreException</code> containing
- * an <code>IStatus</code> will be thrown
- * at some point in the lifecycle of the stream
- * if the file resource cannot be created.
- * @param file The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file resource to create. The project implied by the
- * pathname of the file must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return An <code>OutputStream</code> tied to the file resource.
- * Actual checks of or changes to the workspace may occur as early during
- * stream creation, closure, or any time in between.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- * Reasons include:
- * <ol>
- * <li>The project of the given file's path does not exist.
- * <li>A non-file resource of the same name of the given file
- * already exists.
- * <li>A file resource of the same name of the given file
- * already exists, and <code>overwriteFile</code> is false.
- * <li>One or more intermediate folders to the given file
- * do not exist, and <code>createFolders</code> is false.
- * </ol>
- */
-
- public static OutputStream newFileOutputStream (
- IPath file,
- IStatusHandler statusHandler )
-
- {
- return new FileResourceOutputStream(file, statusHandler);
- }
-
- //----------------------------------------------------------------------
- // Naughty bits...
- //----------------------------------------------------------------------
-
- //
- // Creates a path of folders.
- // Do not call with an absolutePath of less than one segment.
- //
- /**
- * Creates a path of folders.
- * Do not call with an absolutePath of less than one segment.
- * @param resourceContext the resource context for making folders.
- * @param absolutePath the path of folders that will be created.
- * @param progressMonitor the progress monitor to be used.
- * @param statusHandler the status handler.
- * @return returns the IContainer of the created folder.
- */
- public static IContainer makeFolderPath (
- IPath absolutePath,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (absolutePath.segmentCount() <= 1)
- {
- return getWorkspaceRoot().getProject(absolutePath.segment(0));
- }
- else
- {
- IContainer parent = makeFolderPath(absolutePath.removeLastSegments(1), statusHandler );
- String folderName = absolutePath.lastSegment();
-
- return makeFolder(parent,folderName, statusHandler );
- }
- }
- //
- // Creates a folder under a container.
- // The container must already exist.
- //
- private static IFolder makeFolder (
- IContainer parent,
- String folderName,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- IResource child = parent.findMember(folderName);
-
- if( child == null )
- {
- IFolder folder = parent.getFolder(new Path(folderName));
- folder.create(true,true,null);
- return folder;
- }
- else if( child.getType() == IResource.FOLDER )
- {
- return (IFolder)child;
- }
- else
- {
- throw new CoreException(
- new Status( IStatus.ERROR,
- "ResourceUtils",
- 0,
- NLS.bind( Messages.MSG_ERROR_RESOURCE_NOT_FOLDER, parent.getFullPath().append(folderName).toString()),
- null ) );
- }
- }
-
- //
- // Creates a file under a container.
- // The container must already exist.
- //
- private static IFile makeFile (
- IContainer parent,
- String fileName,
- InputStream inputStream,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- IResource child = parent.findMember(fileName);
-
- if( child != null )
- {
- if( child.getType() == IResource.FILE )
- {
- //We have permission to overwrite so check if file is read-only
- if( child.getResourceAttributes().isReadOnly() )
- {
- IFile[] files = new IFile[1];
- files[0] = (IFile)child;
-
- IStatus status = getWorkspace().validateEdit(files,null);
-
- try
- {
- statusHandler.report( status );
- }
- catch( StatusException exc )
- {
- return null;
- }
- }
-
- //Change the contents of the existing file.
- IFile file = parent.getFile( new Path(fileName) );
- file.setContents( inputStream, true, true, null );
-
- return file;
-
- }
- else
- {
- throw new CoreException(
- new Status( IStatus.ERROR,
- "ResourceUtils",
- 0,
- NLS.bind( Messages.MSG_ERROR_RESOURCE_NOT_FILE, parent.getFullPath().append(fileName)),
- null ) );
- }
- }
- else
- {
- //Create a new file.
- IFile file = parent.getFile( new Path(fileName) );
- file.create( inputStream, true, null);
-
- return file;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
deleted file mode 100644
index 4c08ea1..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/Messages.java
+++ /dev/null
@@ -1,39 +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.environment.eclipse;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.wst.common.internal.environment.eclipse.environment";
-
- public static String MSG_NULL_ARG_SPECIFIED;
- public static String MSG_SCHEME_NOT_FOUND;
- public static String MSG_ABSOLUTE_PATH_WITHOUT_SCHEME;
- public static String MSG_URI_NOT_RELATIVE;
- public static String MSG_ERROR_UNEXPECTED_ERROR;
- public static String MSG_INVALID_PLATFORM_URL;
- public static String MSG_INVALID_FILE_URL;
- public static String MSG_ERROR_PATH_NOT_ABSOLUTE;
- public static String MSG_ERROR_PATH_EMPTY;
- public static String MSG_ERROR_PATH_NOT_FOLDER;
- public static String MSG_ERROR_RESOURCE_NOT_FOLDER;
- public static String MSG_ERROR_RESOURCE_NOT_FILE;
- public static String MSG_ERROR_FOLDER_HAS_CHILDREN;
- public static String MSG_ERROR_IO;
- public static String LABEL_YES;
- public static String LABEL_YES_TO_ALL;
- public static String LABEL_CANCEL;
-
- static
- {
- NLS.initializeMessages( BUNDLE_NAME, Messages.class );
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties
deleted file mode 100644
index 97908ad..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/eclipse/environment.properties
+++ /dev/null
@@ -1,40 +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
-###############################################################################
-
-#
-# Messages for SimpleURIFactory
-#
-MSG_NULL_ARG_SPECIFIED=Null specified as argument to {0}.
-MSG_SCHEME_NOT_FOUND=Scheme not found for URI {0}.
-MSG_ABSOLUTE_PATH_WITHOUT_SCHEME=Absolute path specified without a scheme for URI {0}.
-
-#
-# Common Messages
-#
-MSG_URI_NOT_RELATIVE=URL: {0} is not relative.
-MSG_ERROR_UNEXPECTED_ERROR=Unexpected exception occured.
-MSG_INVALID_PLATFORM_URL=Invalid URL: {0} for an Eclipse platform.
-MSG_INVALID_FILE_URL=Invalid URL: {0} for the file protocol
-
-#
-# Messages for ResouceUtils
-#
-MSG_ERROR_PATH_NOT_ABSOLUTE=Path {0} is not absolute for creating a file.
-MSG_ERROR_PATH_EMPTY=Path {0} is empty while creating a file.
-MSG_ERROR_PATH_NOT_FOLDER=Path {0} is not a folder for creating a file.
-MSG_ERROR_RESOURCE_NOT_FOLDER=Resource {0} is not a folder.
-MSG_ERROR_RESOURCE_NOT_FILE=The following path is not a resource: {0}.
-MSG_ERROR_FOLDER_HAS_CHILDREN=Can not create folder: {0} that already has children.
-MSG_ERROR_IO=An input/output error occurred while processing the resource "{0}".
-
-LABEL_YES=Yes
-LABEL_YES_TO_ALL=Yes All
-LABEL_CANCEL=Cancel
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/plugin/EnvironmentPlugin.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/plugin/EnvironmentPlugin.java
deleted file mode 100644
index 4330459..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/plugin/EnvironmentPlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 100364 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.common.internal.environment.plugin;
-
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
-* This is the plugin class for the org.eclipse.wst.common.internal.environment.plugin.EnvironmentPlugin.
-*/
-public class EnvironmentPlugin extends Plugin
-{
- /**
- * The instance of this plugin.
- */
- private static EnvironmentPlugin instance;
-
- /**
- * Constructor for use by the Eclipse platform only.
- */
- public EnvironmentPlugin()
- {
- super();
- instance = this;
- }
-
- /**
- * Returns the instance of this plugin.
- */
- static public EnvironmentPlugin getInstance ()
- {
- return instance;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeScheme.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeScheme.java
deleted file mode 100644
index bb60c0e..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeScheme.java
+++ /dev/null
@@ -1,87 +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.wst.common.internal.environment.relative;
-
-import java.net.URL;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.URIException;
-
-
-public class RelativeScheme implements IURIScheme
-{
-
- public String toString()
- {
- return "relative";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#isHierarchical()
- */
- public boolean isHierarchical()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#isValid(org.eclipse.env.uri.URI)
- */
- public boolean isValid(IURI uri)
- {
- return !uri.toString().startsWith( "/" );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(java.lang.String)
- */
- public IURI newURI(String uri) throws URIException
- {
- return new RelativeURI( uri );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(org.eclipse.env.uri.URI)
- */
- public IURI newURI(IURI uri) throws URIException
- {
- return new RelativeURI( uri.toString() );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(java.net.URL)
- */
- public IURI newURI(URL url) throws URIException
- {
- return new RelativeURI( url.toString() );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#validate(org.eclipse.env.uri.URI)
- */
- public IStatus validate(IURI uri)
- {
- IStatus result = null;
-
- if( isValid( uri ) )
- {
- result = Status.OK_STATUS;
- }
- else
- {
- result = new Status( IStatus.ERROR, "id", 0, "",null );
- }
-
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeURI.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeURI.java
deleted file mode 100644
index 59f3d36..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/relative/RelativeURI.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.environment.relative;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.IURIFilter;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.IURIVisitor;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.internal.environment.eclipse.Messages;
-
-
-public class RelativeURI implements IURI
-{
- protected String uri_;
-
- public RelativeURI( String uri )
- {
- uri_ = uri;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#append(org.eclipse.env.uri.URI)
- */
- public IURI append(IURI relativeURI) throws URIException
- {
- if( !relativeURI.isRelative())
- {
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_URI_NOT_RELATIVE, relativeURI.toString() ), null ) );
-
- }
-
- String newURI = uri_ + "/" + relativeURI.toString();
-
- return getURIScheme().newURI( newURI );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asFile()
- */
- public File asFile()
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asString()
- */
- public String asString()
- {
- return uri_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#toString()
- */
- public String toString()
- {
- return uri_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asURL()
- */
- public URL asURL() throws URIException
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#erase()
- */
- public void erase() throws URIException
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getInputStream()
- */
- public InputStream getInputStream() throws URIException
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getOutputStream()
- */
- public OutputStream getOutputStream() throws URIException
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getURIScheme()
- */
- public IURIScheme getURIScheme()
- {
- return new RelativeScheme();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isAvailableAsFile()
- */
- public boolean isAvailableAsFile()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isAvailableAsURL()
- */
- public boolean isAvailableAsURL()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isHierarchical()
- */
- public boolean isHierarchical()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isLeaf()
- */
- public boolean isLeaf()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isPresent()
- */
- public boolean isPresent()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isReadable()
- */
- public boolean isReadable()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isRelative()
- */
- public boolean isRelative()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isWritable()
- */
- public boolean isWritable()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#list()
- */
- public IURI[] list() throws URIException
- {
- return new IURI[0];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#list(org.eclipse.env.uri.URIFilter)
- */
- public IURI[] list(IURIFilter uriFilter) throws URIException
- {
- return new IURI[0];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#parent()
- */
- public IURI parent() throws URIException
- {
- int lastSlash = uri_.lastIndexOf( '/' );
- int firstSlash = uri_.indexOf( '/' );
-
- // If there is a parent, then it must start with a slash
- // and end with a slash.
- if( lastSlash == -1 || firstSlash == -1 ) return null;
-
- return getURIScheme().newURI( uri_.substring(0, lastSlash ) );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#rename(org.eclipse.env.uri.URI)
- */
- public void rename(IURI newURI) throws URIException
- {
- uri_ = newURI.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#touchFolder()
- */
- public void touchFolder() throws URIException
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#touchLeaf()
- */
- public void touchLeaf() throws URIException
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#visit(org.eclipse.env.uri.URIVisitor, org.eclipse.env.uri.URIFilter)
- */
- public void visit(IURIVisitor uriVisitor, IURIFilter uriFilter)
- throws URIException
- {
- boolean continueVisit = true;
-
- // If the filter accepts this we will visit it.
- if( uriFilter.accepts( this ) )
- {
- continueVisit = uriVisitor.visit( this );
- }
-
- IURI[] children = list();
-
- for( int index = 0; index < children.length && continueVisit; index++ )
- {
- children[index].visit( uriVisitor, uriFilter );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#visit(org.eclipse.env.uri.URIVisitor)
- */
- public void visit(IURIVisitor uriVisitor) throws URIException
- {
- boolean continueVisit = uriVisitor.visit( this );
-
- IURI[] children = list();
-
- for( int index = 0; index < children.length && continueVisit; index++ )
- {
- children[index].visit( uriVisitor );
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileScheme.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileScheme.java
deleted file mode 100644
index 3dd4f89..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileScheme.java
+++ /dev/null
@@ -1,106 +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.wst.common.internal.environment.uri.file;
-
-import java.net.URL;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.internal.environment.eclipse.Messages;
-import org.eclipse.wst.common.internal.environment.relative.RelativeScheme;
-import org.eclipse.wst.common.internal.environment.relative.RelativeURI;
-
-
-public class FileScheme extends RelativeScheme
-{
- public String toString()
- {
- return "file";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#isValid(org.eclipse.env.uri.URI)
- */
- public boolean isValid(IURI uri)
- {
- boolean result = false;
-
- if( uri == null ) return false;
-
- IURIScheme scheme = uri.getURIScheme();
-
- if( scheme.toString().equals( "relative") ) return scheme.isValid( uri );
-
- String uriString = uri.toString();
-
- if( uriString != null && uriString.startsWith( "file:" ) )
- {
- result = true;
- }
-
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(java.lang.String)
- */
- public IURI newURI(String uri) throws URIException
- {
- String newURI = null;
-
- if( uri != null && uri.startsWith( "file:") )
- {
- // The file protocol has been specified so keep it as is.
- newURI = uri;
- }
- else if( uri == null || uri.indexOf( ":") != -1 )
- {
- // The file uri is not allowed to contain some other protocol.
- throw new URIException(
- new Status( IStatus.ERROR, "id", 0,
- NLS.bind( Messages.MSG_INVALID_FILE_URL,uri), null ) );
-
- }
- else if( uri.startsWith( "/") )
- {
- // The file scheme has not been specified so we will add it.
- newURI = "file:" + uri;
- }
-
- if( newURI == null )
- {
- return new RelativeURI( uri );
- }
- else
- {
- return new FileURI( newURI );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(org.eclipse.env.uri.URI)
- */
- public IURI newURI(IURI uri) throws URIException
- {
- return newURI( uri == null ? null : uri.toString() );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URIScheme#newURI(java.net.URL)
- */
- public IURI newURI(URL url) throws URIException
- {
- return newURI( url == null ? null : url.toString() );
- }
-}
diff --git a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileURI.java b/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileURI.java
deleted file mode 100644
index ecc1664..0000000
--- a/plugins/org.eclipse.wst.common.environment/src/org/eclipse/wst/common/internal/environment/uri/file/FileURI.java
+++ /dev/null
@@ -1,297 +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.wst.common.internal.environment.uri.file;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.environment.uri.IURIFilter;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.internal.environment.relative.RelativeURI;
-
-
-public class FileURI extends RelativeURI
-{
- private File file_ = null;
-
- public FileURI( String uri )
- {
- super( uri );
-
- if( getURIScheme().isValid( this ) )
- {
- file_ = new File( uri.substring( 5, uri.length() ) );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asFile()
- */
- public File asFile()
- {
- return file_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#erase()
- */
- public void erase() throws URIException
- {
- deleteFile( file_ );
- }
-
- private void deleteFile( File file )
- {
- if( file.isDirectory() )
- {
- File[] children = file.listFiles();
-
- for( int index = 0; index < children.length; index++ )
- {
- File child = children[index];
-
- if( child.isDirectory() )
- {
- deleteFile( child );
- }
- else
- {
- child.delete();
- }
- }
- }
-
- file.delete();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getInputStream()
- */
- public InputStream getInputStream() throws URIException
- {
- FileInputStream stream = null;
-
- try
- {
- File parent = file_.getParentFile();
- parent.mkdirs();
-
- stream = new FileInputStream( file_ );
- }
- catch( IOException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
-
- return stream;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getOutputStream()
- */
- public OutputStream getOutputStream() throws URIException
- {
- FileOutputStream stream = null;
-
- try
- {
- File parent = file_.getParentFile();
- parent.mkdirs();
-
- stream = new FileOutputStream( file_ );
- }
- catch( IOException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
-
- return stream;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#getURIScheme()
- */
- public IURIScheme getURIScheme()
- {
- return new FileScheme();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isAvailableAsFile()
- */
- public boolean isAvailableAsFile()
- {
- return file_ != null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isAvailableAsURL()
- */
- public boolean isAvailableAsURL()
- {
- return file_ != null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#asURL()
- */
- public URL asURL() throws URIException
- {
- URL url = null;
-
- try
- {
- url = file_ == null ? null : file_.toURL();
- }
- catch( MalformedURLException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
-
- return url;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isLeaf()
- */
- public boolean isLeaf()
- {
- return file_.isFile();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isPresent()
- */
- public boolean isPresent()
- {
- return file_.exists();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isReadable()
- */
- public boolean isReadable()
- {
- return file_.canRead();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#isWritable()
- */
- public boolean isWritable()
- {
- return file_.canWrite();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#list()
- */
- public IURI[] list() throws URIException
- {
- File[] children = file_.listFiles();
- IURI[] URIs = new IURI[0];
-
- if( children != null )
- {
- int length = children.length;
-
- URIs = new IURI[length];
-
- for( int index = 0; index < length; index++ )
- {
- URIs[index] = new FileURI( "file:" + children[index].getAbsolutePath() );
- }
- }
-
- return URIs;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#list(org.eclipse.env.uri.URIFilter)
- */
- public IURI[] list(IURIFilter uriFilter) throws URIException
- {
- File[] children = file_.listFiles();
- int length = children == null ? 0 : children.length;
- Vector URIs = new Vector();
-
- for( int index = 0; index < length; index++ )
- {
- IURI newURI = new FileURI( "file:" + children[index].getAbsolutePath() );
-
- if( uriFilter.accepts( newURI) )
- {
- URIs.add( newURI );
- }
- }
-
- return (IURI[])URIs.toArray( new IURI[0] );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#rename(org.eclipse.env.uri.URI)
- */
- public void rename(IURI newURI) throws URIException
- {
- try
- {
- uri_ = newURI.toString();
- URL newURL = new URL( uri_ );
- file_.renameTo( new File( newURL.getPath() ) );
- }
- catch( MalformedURLException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#touchFolder()
- */
- public void touchFolder() throws URIException
- {
- file_.mkdirs();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.env.uri.URI#touchLeaf()
- */
- public void touchLeaf() throws URIException
- {
- try
- {
- // Ensure that the parent folders are created.
- File parent = file_.getParentFile();
- parent.mkdirs();
-
- file_.createNewFile();
- }
- catch( IOException exc )
- {
- throw new URIException( new Status( IStatus.ERROR, "id", 0, exc.getMessage(), exc ), this );
- }
- }
-
- public boolean isRelative()
- {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.classpath b/plugins/org.eclipse.wst.common.frameworks.ui/.classpath
deleted file mode 100644
index 0ea0610..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="wtp_ui/"/>
- <classpathentry kind="src" path="property_files"/>
- <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"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore b/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore
deleted file mode 100644
index a1a7a15..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-wtp_ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.project b/plugins/org.eclipse.wst.common.frameworks.ui/.project
deleted file mode 100644
index 47885fd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.frameworks.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b61fd97..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Mar 31 16:58:45 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index dd05c9b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.common.frameworks.ui; singleton:=true
-Bundle-Version: 1.1.101.qualifier
-Bundle-Activator: org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.frameworks.internal.datamodel.ui;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.dialog.ui;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.eclipse.ui;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.operation.extensionui;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.ui;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/about.html b/plugins/org.eclipse.wst.common.frameworks.ui/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
deleted file mode 100644
index feb73fb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- plugin.properties,\
- about.html
-source.. = wtp_ui/,\
- property_files/
-src.includes = schema/,\
- plugin.properties
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
deleted file mode 100644
index 20819aa..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-Cut=Cut
-FLEXIBLE_PROJECT_PREFERENCE=J2EE Project Modules
-providerName=Eclipse.org
-pluginName=WTP UI Plug-in
-WTP_UI_Action=WTP UI Action
-Extended_Viewers=Extended Viewers
-Extendable_Wizard=Extendable Wizard
-Extendable_Wizard_Page=Extendable Wizard Page
-DataModelWizard=DataModelWizard
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
deleted file mode 100644
index f1e3ab7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="wtpuiAction" name="%WTP_UI_Action" schema="schema/wtpuiAction.exsd"/>
- <extension-point id="extendedViewer" name="%Extended_Viewers" schema="schema/extendedViewer.exsd"/>
- <extension-point id="extendableWizard" name="%Extendable_Wizard" schema="schema/extendableWizard.exsd"/>
- <extension-point id="wizardPageGroup" name="%Extendable_Wizard_Page" schema="schema/extendableWizardPage.exsd"/>
- <extension-point id="DataModelWizardExtension" name="%DataModelWizard" schema="schema/DataModelWizardExtension.exsd"/>
-
- <extension
- id="UITester"
- point="org.eclipse.jem.util.uiTester">
- <uiTester
- className="org.eclipse.wst.common.frameworks.internal.ui.UITesterImpl">
- </uiTester>
- </extension>
- <extension
- id="context.Sensitive.Class.saveHandler"
- name="Save Handler - Headless Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="saveHandler"
- context="UI"
- className="org.eclipse.wst.common.frameworks.internal.ui.SaveHandlerUI">
- </uiContextSensitiveClass>
- </extension>
- <extension
- id="org.eclipse.wst.common.frameworks.internal.ui.EnablementDetermination"
- name="UI Enablement Determination"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="org.eclipse.wst.common.frameworks.internal.EnablementDetermination"
- context="UI"
- className="org.eclipse.wst.common.frameworks.internal.ui.UIEnablementManager">
- </uiContextSensitiveClass>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.WTPActivityBridgeHelper">
- <WTPActivityBridgeHelper
- class="org.eclipse.wst.common.frameworks.internal.ui.WTPActivityBridgeHelperImpl">
- </WTPActivityBridgeHelper>
- </extension>
- <!--
- <extension
- point="org.eclipse.wst.common.frameworks.internals.OperationExtension">
- <operationExtension
- postOperationClass="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PostPasteActionOperation"
- id="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PasteActionOperation"/>
- </extension>
- -->
- <extension
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="ISimpleValidateEditContext"
- className="org.eclipse.wst.common.frameworks.internal.ui.SimpleValidateEditContextUI"
- context="UI"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml b/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml
deleted file mode 100644
index d2dca48..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +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.common.ui"/>
- <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_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties
deleted file mode 100644
index fbdef12..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/messages.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-WizardNewProjectCreationPage_projectContentsLabel = Project contents:
-WizardNewProjectCreationPage_useDefaultLabel = Use &default
-WizardNewProjectCreationPage_locationLabel = Director&y:
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
deleted file mode 100644
index dc661b8..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-IActionWTPOperation_UI_0=No action available for execution.
-WTPActionDialog_UI_0=Select the optional dependent actions you would like to execute.
-WTPOptionalOperationDataModel_UI_0=Root tree can not be selected.
-WTPOptionalOperationDataModel_UI_1=No operations are selected.
-MasterDescriptor_ERROR_2=IWAE0005E WTPUIOperation elements require exactly one <selectionEnablement />.
-WTPOperationAction_UI_0=Operation Status
-WTPOperationAction_UI_1=Problem executing operation.
-TimerQueue_ERROR_0=IWAE0006E Can't start a TimerQueue that is already running
-ExtendedWizardPage_ERROR_0=IWAE0007E Cannot modify id after it has already been set.
-ExtendedWizardPage_ERROR_1=IWAE0008E The id cannot be null
-MasterDescriptor_UI_1=No \" {0} \" attribute defined
-Timer_UI_0=Invalid delay: {0}
-Timer_UI_1=Invalid initial delay: {0}
-WTPWizard_UI_0=Wizard Error: {0}
-WTPWizard_UI_1=An error has occurred when {0} finished.
-WTPWizard_UI_2=Wizard Warning: {0}
-ExtendableWizard_UI_0=Wizard page failed to be created in {0} {1}
-WizardPageExtensionManager_UI_0=Element: {0} does not allow page insertion after.
-WizardPageExtensionManager_UI_1={0} will not be created
-WizardPageExtensionManager_UI_2=Circular dependency, element: {0} check: {1}
-WizardPageExtensionManager_UI_3=Editor does not allow page insertions
-WizardPageExtensionManager_UI_4=Parent Class Not Found Error: {0} \r\n for attribute: {1} in plugin {2} \r\nPage not created
-Delete_UI_0=Delete
-Name_=Project name:
-Browse_=Browse...
-Project_location_=Project Location:
-MULTIPLE_MODULE_PREF_TEXT=Allow Multiple modules per project
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
deleted file mode 100644
index 40c75b4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/DataModelWizardExtension.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks.ui" id="DataModelWizardExtension" name="Data Model Wizard Extension"/>
- </appInfo>
- <documentation>
- An extension to a specific Data Model Wizard.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="DataModelWizard"/>
- </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="DataModelWizard">
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the data model wizard extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- the fully qualified classname of the data model wizard class implementation
- </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.frameworks.ui/schema/extendableWizard.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
deleted file mode 100644
index 9749927..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks.ui" id="extendableWizard" name="Extendable Wizard"/>
- </appInfo>
- <documentation>
- This declares a data model wizard as a valid extendable wizard.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extendableWizard" 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="extendableWizard">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A required id for the data model wizard instance to be extended
- </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>
-
- </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.frameworks.ui/schema/extendableWizardPage.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
deleted file mode 100644
index 504c8f6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks.ui" id="wizardPageGroup" name="Extendable Wizard Page"/>
- </appInfo>
- <documentation>
- This allows you to add an data model wizard page to a predefined extensable data model wizard.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <choice>
- <element ref="wizardPageGroup"/>
- </choice>
- </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="wizardPageGroup">
- <complexType>
- <sequence>
- <choice>
- <element ref="factory"/>
- </choice>
- </sequence>
- <attribute name="wizardID" type="string" use="required">
- <annotation>
- <documentation>
- This must match the id defined in the extendableWizard element in the extendableWizard extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="allowsExtendedPagesAfter" type="string">
- <annotation>
- <documentation>
- optional setting to specify whether this page allows extended pages after itself, default it true
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pageGroupInsertionID" type="string">
- <annotation>
- <documentation>
- If this page is to immediately after another page, this must match the pageID of the page to insert after.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pageGroupID" type="string">
- <annotation>
- <documentation>
- optional setting for the page group ID
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- This class is an instancof com.ibm.wtp.common.ui.wizard.extensions.WizardExtensionFactory
- </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>
-
- </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.frameworks.ui/schema/extendedViewer.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
deleted file mode 100644
index aa8908a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks.ui" id="extendedViewer" name="Extended Viewers"/>
- </appInfo>
- <documentation>
- The extendedViewer extension point allows the contribution of new function to an existing viewer.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extendedViewer"/>
- </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="extendedViewer">
- <complexType>
- <attribute name="viewerID" type="string" use="required">
- <annotation>
- <documentation>
- a required id for the extendedViewer instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="parentViewerID" type="string">
- <annotation>
- <documentation>
- an optional id used to specify a parent viewer
- </documentation>
- </annotation>
- </attribute>
- <attribute name="factoryClass" type="string" use="required">
- <annotation>
- <documentation>
- the fully qualified name of the associated factory class
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- the optional path to an icon image
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- a required label description for the extended viewer
- </documentation>
- </annotation>
- </attribute>
- <attribute name="functionGroupID" type="string">
- <annotation>
- <documentation>
- an optional setting to associate the extended viewer with a specific function group 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.frameworks.ui/schema/wtpuiAction.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
deleted file mode 100644
index 1f8861b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks.ui" id="wtpuiAction" name="WTP UI Action"/>
- </appInfo>
- <documentation>
- This extension point is for WTP Operations which need to be tied to a generic UI action, such as CUT, COPY, PASTE, DELETE, and RENAME.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <choice>
- <element ref="masterOperation"/>
- <element ref="slaveOperation"/>
- </choice>
- </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="masterOperation">
- <annotation>
- <documentation>
- A masterOperation enables an existing WTP Operation to be used in a UI action. Generic Ids aggregate a set of masterOperations for the same Abstract action (like a "CUT" operation). WTP Operations are themselves extendible, so for any masterOperation defined, there may be any number of pre|post operations. These pre|post operation can have slaveOperation elements defined which indicate the pre|post operation may be run independently.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="selectionEnablement"/>
- </sequence>
- <attribute name="extendedGenericId" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the Generic Action you would like to contribute to. (e.g. The id for CUT, COPY, PASTE, DELETE, RENAME).
- </documentation>
- </annotation>
- </attribute>
- <attribute name="operationClass" type="string">
- <annotation>
- <documentation>
- The fully qualified class of your operation. Your operation must be a WTPOperation and must provide a no-arguments default constructor. If this attribute is not provided, the getDefaultOperation() returned by the dataModel will be used.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="populatorClass" type="string" use="required">
- <annotation>
- <documentation>
- The populatorClass knows how to provide a WTP Operation Data Model based on a given selection. The getDefaultOperation() method of the data model will be ignored if the operationClass is provided.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="alwaysExecute" type="boolean">
- <annotation>
- <documentation>
- optional setting to determine execution context
- </documentation>
- </annotation>
- </attribute>
- <attribute name="overrideId" type="string">
- <annotation>
- <documentation>
- optional setting to define an overridable id
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- optional identification for operation instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="selectionEnablement">
- <annotation>
- <documentation>
- The selectionEnablement element allows you to filter which kinds of selection your object is applicable to using Standard Eclipse Action Expresions.
- </documentation>
- </annotation>
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="or"/>
- </choice>
- </complexType>
- </element>
-
- <element name="slaveOperation">
- <annotation>
- <documentation>
- The slaveOperation element defines display information for operations which extend a declared master operation. If a pre|post operation of a master does not have a corresponding slaveOperation element, then the pre|post operation will be consider required, and not be displayed to the user.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="operationClass" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified class of your operation. Your operation must be a WTPOperation and must provide a no-arguments default constructor. For slave operations, the data model of the master operation will be provided. Therefore, slaves cannot override the data model using a seperate populatorClass.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="or">
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="and"/>
- <element ref="objectState"/>
- </choice>
- </complexType>
- </element>
-
- <element name="objectClass">
- <complexType>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- fully qualified name of the object class
- </documentation>
- </annotation>
- </attribute>
- <attribute name="adaptable" type="string">
- <annotation>
- <documentation>
- optional setting to specify the object class as adaptable
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="and">
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="or"/>
- </choice>
- </complexType>
- </element>
-
- <element name="objectState">
- <complexType>
- <attribute name="value" type="string">
- <annotation>
- <documentation>
- optional setting for the value of a specific object state
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- optional setting for an object state name to check the selected object's value is matching with
- </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>
- <!-- The examples in this section have been commented out because they reference only extension point IDs. These examples must be corrected before being included in the documentation. -->
-<!--
-The following example declares two Master Operations (<code>com.acme.ui.operation.MasterOperationA</code> and <code>com.acme.ui.operation.MasterOperationB</code>) which are attached to the Generic ID <code>com.acme.ui.WTPOptionalOperationTest</code>.
-The scenario has Master A which has as a pre-operation of Slave A and a post-operation of Slave C. Slave A is made optional by the <code>slaveOperation</code> element, while Slave C will always be run (no <code>slaveOperation</code> is given to run it seperately). Slave A further has an optional pre-operation (Slave B) that can be executed indepently of either Slave A or Master A.
--->
-<!--
-<pre>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wtpuiAction">
- <masterOperation
- populatorClass="com.acme.ui.operation.AcmeOperationPopulator"
- name="%master_a_name"
- operationClass="com.acme.ui.operation.MasterOperationA"
- extendedGenericId="com.acme.ui.WTPOptionalOperationTest"
- description="%master_a_description">
- </masterOperation>
- <slaveOperation
- name="Slave A"
- operationClass="com.acme.ui.operation.SlaveOperationA">
- </slaveOperation>
- <slaveOperation
- name="Slave B"
- operationClass="com.acme.ui.operation.SlaveOperationB">
- </slaveOperation>
- <masterOperation
- populatorClass="com.acme.ui.operation.AcmeOperationPopulator"
- name="EAR Project Action"
- operationClass="com.acme.ui.operation.MasterOperationB"
- extendedGenericId="com.acme.ui.WTPOptionalOperationTest">
- <selectionEnablement>
- <objectState name="projectNature" value="org.eclipse.jst.j2ee.EARNature" />
- </selectionEnablement>
- </masterOperation>
- </extension>
-</pre>
--->
-<!--
-For each of the slaveOperations referenced above, you must have a corresponding WTP Operation Extension declared similar to the following:
--->
-<!--
-<pre>
- <extension
- id="wtpuiAciton.Acme.Extensions"
- point="org.eclipse.wst.common.frameworks.ExtendableOperation">
- <extendableOperation
- class="com.acme.ui.operation.MasterOperationA"
- id="com.acme.ui.operation.MasterOperationA">
- </extendableOperation>
- <extendableOperation
- class="com.acme.ui.operation.SlaveOperationA"
- id="com.acme.ui.operation.SlaveOperationA">
- </extendableOperation>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension">-->
- <!-- Made optional by the above declaration -->
- <!--<operationExtension
- preOperationClass="com.acme.ui.operation.SlaveOperationA"
- id="com.acme.ui.operation.MasterOperationA">
- </operationExtension>-->
- <!-- Made optional by the above declaration -->
- <!--<operationExtension
- postOperationClass="com.acme.ui.operation.SlaveOperationB"
- id="com.acme.ui.operation.SlaveOperationA">
- </operationExtension>-->
- <!-- Non-optional operation, will always run -->
- <!--<operationExtension
- postOperationClass="com.acme.ui.operation.SlaveOperationC"
- id="com.acme.ui.operation.MasterOperationA">
- </operationExtension>
- </extension>
-</pre>
--->
-<!--
-In general, users extending existing actions only need to declare the following:
--->
-<!--
-<pre>
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension">-->
- <!-- The action referenced must be declared as extensible by the org.eclipse.wst.common.frameworks.ExtendableOperation extension point -->
- <!--<operationExtension
- preOperationClass="...YOUR CLASS..."
- id="...ID OF EXISTING OPERATION...">
- </operationExtension>
- </extension>
-</pre>
--->
-<!--
-And if your operation is optional declare the slaveOperation:
--->
-<!--
-<pre>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wtpuiAction">
- <slaveOperation
- name="..NAME OF YOUR OPERATION..."
- description="...DESCRIPTION OF YOUR ACTION..."
- operationClass="...YOUR CLASS...">
- </slaveOperation>
- </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.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
deleted file mode 100644
index 53c3360..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/AddablePageGroup.java
+++ /dev/null
@@ -1,16 +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.frameworks.internal.datamodel.ui;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-public interface AddablePageGroup extends IDMPageGroup
-{
- public void addPage( IWizardPage page );
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelSynchHelper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelSynchHelper.java
deleted file mode 100644
index bf8cfda..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelSynchHelper.java
+++ /dev/null
@@ -1,569 +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.frameworks.internal.datamodel.ui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.StructuredViewer;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.ui.TimedModifyListener;
-
-/**
- * This class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class DataModelSynchHelper implements IDataModelListener {
- protected static final boolean isLinux = System.getProperty("os.name").equals("Linux"); //$NON-NLS-1$ //$NON-NLS-2$
-
- protected IDataModel dataModel;
- protected Map widgetToPropertyHash;
- protected Map propertyToWidgetHash;
- protected Map widgetToDepControls;
-
- protected String currentProperty;
- protected Widget currentWidget;
- protected Widget currentWidgetFromEvent; // TODO M4 see if this should be set with for
- // listeners
- protected boolean ignoreModifyEvent = false;
-
- private class ModifyTextListener implements ModifyListener {
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- Text text = (Text) e.getSource();
- if (currentWidget == text)
- return;
- String propertyName = (String) widgetToPropertyHash.get(text);
- setProperty(propertyName, text.getText());
- }
- }
-
- private ModifyTextListener modifyTextListener;
- private TimedModifyListener timedModifyListener;
-
- private class ComboListener implements SelectionListener, ModifyListener {
-
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
-
- try {
- currentWidgetFromEvent = combo;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- DataModelPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String description = combo.getText();
- // On a combo selection linux fires 2 events;
- // the first clears the value which needs to be ignored when the type is not String
- // the second sets the new value
- if (isLinux && description.length() == 0 && descriptors.length != 0 && !(descriptors[0].getPropertyValue() instanceof String)) {
- return;
- }
- for (int i = 0; i < descriptors.length; i++) {
- if (description.equals(descriptors[i].getPropertyDescription())) {
- setProperty(propertyName, descriptors[i].getPropertyValue());
- return;
- }
- }
- setProperty(propertyName, combo.getText());
- } finally {
- currentWidgetFromEvent = null;
- }
- }
-
- public void widgetSelected(SelectionEvent e) {
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- if (combo.getSelectionIndex() >= 0) {
- DataModelPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String description = combo.getItem(combo.getSelectionIndex());
- for (int i = 0; i < descriptors.length; i++) {
- if (description.equals(descriptors[i].getPropertyDescription())) {
- setProperty(propertyName, descriptors[i].getPropertyValue());
- return;
- }
- }
- setProperty(propertyName, combo.getItem(combo.getSelectionIndex()));
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- private ComboListener comboListener;
-
- private class CheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (currentWidget == button)
- return;
- String propertyName = (String) widgetToPropertyHash.get(button);
- setProperty(propertyName, new Boolean(button.getSelection()));
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- private CheckboxSelectionListener checkboxSelectionListener;
-
- public DataModelSynchHelper(IDataModel model) {
- this.dataModel = model;
- dataModel.addListener(this);
- }
-
- private CheckBoxViewerListener checkBoxViewerStateListener;
-
- private class CheckBoxViewerListener implements ICheckStateListener {
- public void checkStateChanged(CheckStateChangedEvent event) {
- StructuredViewer viewer = (StructuredViewer) event.getSource();
- CheckboxTableViewer checkBoxTableViewer;
- CheckboxTreeViewer checkBoxTreeViewer;
- Object[] items = null;
- if (viewer instanceof CheckboxTableViewer) {
- checkBoxTableViewer = (CheckboxTableViewer) viewer;
- items = checkBoxTableViewer.getCheckedElements();
- } else if (viewer instanceof CheckboxTreeViewer) {
- checkBoxTreeViewer = (CheckboxTreeViewer) viewer;
- items = checkBoxTreeViewer.getCheckedElements();
- }
- String propertyName = (String) widgetToPropertyHash.get(viewer.getControl());
- setPropertyItems(propertyName, items);
- }
- }
-
- public void propertyChanged(DataModelEvent event) {
- String propertyName = event.getPropertyName();
- int flag = event.getFlag();
- if (flag == DataModelEvent.ENABLE_CHG)
- setEnablement(propertyName, event.isPropertyEnabled());
- else
- synchUIWithModel(propertyName, flag);
- }
-
- protected void setProperty(String propertyName, Object value) {
- currentProperty = propertyName;
- try {
- dataModel.setProperty(propertyName, value);
- } finally {
- currentProperty = null;
- }
- }
-
- protected void setPropertyItems(String propertyName, Object[] items) {
- currentProperty = propertyName;
- try {
- dataModel.setProperty(propertyName, items);
- } finally {
- currentProperty = null;
- }
- }
-
- /**
- * Sets the UI to have the property value defined in the model
- *
- * @param propertyName
- * @link IDataModelListener for the flag values.
- */
- public void synchUIWithModel(final String propertyName, final int flag) {
- if (null != propertyToWidgetHash && propertyToWidgetHash.containsKey(propertyName)) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try {
- currentWidget = (Widget) propertyToWidgetHash.get(propertyName);
- if (currentWidget != null && currentWidget != currentWidgetFromEvent) {
- //We must hold a copy in a temp variable because setting the widget value
- //may trigger an event that will cause this method to be called again.
- Widget widget = currentWidget;
- try {
- ignoreModifyEvent = true;
- if (currentWidget instanceof Text)
- setWidgetValue(propertyName, flag, (Text) currentWidget);
- else if (currentWidget instanceof Combo) {
- setWidgetValue(propertyName, flag, (Combo) currentWidget);
- } else if (currentWidget instanceof Button)
- setWidgetValue(propertyName, flag, (Button) currentWidget);
- else if (currentWidget instanceof Label)
- setWidgetValue(propertyName, flag, (Label) currentWidget);
- else if (currentWidget instanceof List)
- setWidgetValue(propertyName, flag, (List) currentWidget);
- else if (currentWidget instanceof Table)
- setWidgetValue(propertyName, flag, (Table) currentWidget);
- else if (currentWidget instanceof Tree)
- setWidgetValue(propertyName, flag, (Tree) currentWidget);
- } finally {
- ignoreModifyEvent = false;
- }
- //Pass the copy of the currentWidget
- setEnablement((Control) widget, dataModel.isPropertyEnabled(propertyName));
- }
- } finally {
- currentWidget = null;
- }
- }
- });
- }
- }
-
- /**
- * @param control
- * @param enabled
- */
- protected void setEnablement(Control control, boolean enabled) {
- if (control.isEnabled() != enabled)
- control.setEnabled(enabled);
- setDependentControlEnablement(control, enabled);
- }
-
- private void setEnablement(final String propertyName, final boolean enabled) {
- if (propertyToWidgetHash != null) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- Control control = (Control) propertyToWidgetHash.get(propertyName);
- if (control != null) {
- setEnablement(control, enabled);
- }
- }
- });
- }
- }
-
- /**
- * @param control
- * @param enabled
- */
- private void setDependentControlEnablement(Control control, boolean enabled) {
- if (widgetToDepControls != null) {
- Control[] dependents = (Control[]) widgetToDepControls.get(control);
- if (dependents != null) {
- Control dep = null;
- for (int i = 0; i < dependents.length; i++) {
- dep = dependents[i];
- if (dep.isEnabled() != enabled)
- dep.setEnabled(enabled);
- }
- }
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Button button) {
- if ((button.getStyle() & SWT.CHECK) == SWT.CHECK || (button.getStyle() & SWT.RADIO) == SWT.RADIO) {
- boolean checked = dataModel.getBooleanProperty(propertyName);
- if (button.getSelection() != checked) {
- button.setSelection(checked);
- }
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Combo combo) {
- if (flag == DataModelEvent.VALID_VALUES_CHG || combo.getItemCount() == 0) {
- // Display properties should only fire if the contents change.
- DataModelPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String[] items = new String[descriptors.length];
- for (int i = 0; i < descriptors.length; i++) {
- items[i] = descriptors[i].getPropertyDescription();
- }
- combo.setItems(items);
- }
- String newText = dataModel.getPropertyDescriptor(propertyName).getPropertyDescription();
- int selIndex = combo.getSelectionIndex();
- if (selIndex < 0 || !newText.equals(combo.getItem(selIndex))) {
- String[] items = combo.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i].equals(newText)) {
- combo.select(i);
- return;
- }
- }
- }
- combo.setText(newText);
- }
-
- protected void setWidgetValue(String propertyName, int flag, Text text) {
- String newText = dataModel.getStringProperty(propertyName);
- if (!newText.equals(text.getText())) {
- text.setText(newText);
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Table table) {
- Object[] elements = (Object[]) dataModel.getProperty(propertyName);
- if (elements == null || elements.length == 0) {
- setTableItemsChecked(table.getItems(), false);
- return;
- }
- java.util.List elementList = Arrays.asList(elements);
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem item = tableItems[i];
- if (elementList.contains(item.getData()))
- item.setChecked(true);
- else
- item.setChecked(false);
- }
- }
-
- protected void setTableItemsChecked(TableItem[] tableItems, boolean b) {
- for (int i = 0; i < tableItems.length; i++)
- tableItems[i].setChecked(b);
- }
-
- protected void setWidgetValue(String propertyName, int flag, Tree tree) {
- Object[] elements = (Object[]) dataModel.getProperty(propertyName);
- if (elements == null)
- return;
- java.util.List elementList = Arrays.asList(elements);
- TreeItem[] treeItems = tree.getItems();
- if (elementList.size() == 0) {
- setTreeItemsGrey(treeItems, false);
- return;
- }
- if (treeItems.length > 0)
- setTreeItemChecked(treeItems, elementList);
- }
-
- public void setTreeItemsGrey(TreeItem[] treeItems, boolean b) {
- for (int i = 0; i < treeItems.length; i++) {
- TreeItem item = treeItems[i];
- item.setGrayed(b);
- setTreeItemsGrey(treeItems[i].getItems(), b);
- }
- }
-
- protected void setTreeItemChecked(TreeItem[] treeItems, java.util.List items) {
- for (int i = 0; i < treeItems.length; i++) {
- if (items.contains(treeItems[i].getData())){
- treeItems[i].setChecked(true);
- treeItems[i].setGrayed(false);
- }else{
- treeItems[i].setGrayed(true);
- }
- TreeItem[] childernItems = treeItems[i].getItems();
- if (childernItems.length > 0) {
- treeItems[i].setExpanded(true);
- setTreeItemChecked(childernItems, items);
- }
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Label label) {
- String newText = dataModel.getStringProperty(propertyName);
- if (!newText.equals(label.getText())) {
- label.setText(newText);
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, List list) {
- Object newContents = dataModel.getProperty(propertyName);
- if (newContents == null) {
- list.setItems(new String[0]);
- return;
- }
- if (newContents instanceof java.util.List) {
- java.util.List modelContents = (java.util.List) newContents;
- String[] items = new String[modelContents.size()];
- for (int i = 0; i < modelContents.size(); i++) {
- items[i] = modelContents.get(i).toString();
- }
- list.setItems(items);
- } else if (newContents instanceof String[]) {
- list.setItems((String[]) newContents);
- }
- }
-
- public void synchAllUIWithModel() {
- if (null != propertyToWidgetHash) {
- Collection keys = propertyToWidgetHash.keySet();
- if (!keys.isEmpty()) {
- Iterator propertyNames = keys.iterator();
- String propertyName = null;
- while (propertyNames.hasNext()) {
- propertyName = (String) propertyNames.next();
- synchUIWithModel(propertyName, DataModelEvent.VALUE_CHG);
- }
- }
- }
- }
-
- protected void synchComposite(Widget widget, String propertyName, Control[] depControls) {
- if (null == widgetToPropertyHash)
- widgetToPropertyHash = new HashMap();
- if (propertyToWidgetHash == null)
- propertyToWidgetHash = new HashMap();
- widgetToPropertyHash.put(widget, propertyName);
- propertyToWidgetHash.put(propertyName, widget);
- if (depControls != null) {
- if (widgetToDepControls == null)
- widgetToDepControls = new HashMap();
- widgetToDepControls.put(widget, depControls);
- }
- synchUIWithModel(propertyName, DataModelEvent.VALUE_CHG);
- }
-
- public void synchText(Text text, String propertyName, Control[] dependentControls) {
- synchText(text, propertyName, false, dependentControls);
- }
-
- public void synchText(Text text, String propertyName, boolean isTimeModified, Control[] dependentControls) {
- synchComposite(text, propertyName, dependentControls);
- if (isTimeModified)
- text.addModifyListener(getTimedListener());
- else
- text.addModifyListener(getModifyTextListener());
- }
-
- public void synchLabel(Label label, String propertyName, Control[] dependentControls) {
- synchComposite(label, propertyName, dependentControls);
- }
-
- /**
- * Use this to synch the contents of the <code>list</code> to the List elements returned from
- * the <code>propertyName</code>.
- */
- public void synchList(List list, String propertyName, Control[] dependentControls) {
- synchComposite(list, propertyName, dependentControls);
- }
-
- /**
- * Use this to synch the value of the specified Combo with the specified propertyName. The
- * possible values displayed to the user are determined by return of
- * IDataModel.getValidPropertyDescriptors(String).
- *
- * @param combo
- * @param propertyName
- * @param dependentControls
- */
- public void synchCombo(Combo combo, String propertyName, Control[] dependentControls) {
- synchComposite(combo, propertyName, dependentControls);
- if (null == comboListener) {
- comboListener = new ComboListener();
- }
- combo.addSelectionListener(comboListener);
- combo.addModifyListener(comboListener);
- }
-
- /**
- * Use this to sync the state of the specified checkbox with the value of the specified
- * propertyName. The specified propertyName must contain a java.lang.Boolean typed Object.
- *
- * @param checkbox
- * @param propertyName
- * @param dependentControls
- */
- public void synchCheckbox(Button checkbox, String propertyName, Control[] dependentControls) {
- synchComposite(checkbox, propertyName, dependentControls);
- if (null == checkboxSelectionListener) {
- checkboxSelectionListener = new CheckboxSelectionListener();
- }
- checkbox.addSelectionListener(checkboxSelectionListener);
- }
-
- public void synchCheckBoxTableViewer(CheckboxTableViewer tableViewer, String propertyName, Control[] dependentControls) {
- synchComposite(tableViewer.getControl(), propertyName, dependentControls);
- if (null == checkBoxViewerStateListener) {
- checkBoxViewerStateListener = new CheckBoxViewerListener();
- }
- tableViewer.addCheckStateListener(checkBoxViewerStateListener);
- }
-
- public void synchCheckBoxTreeViewer(CheckboxTreeViewer treeViewer, String propertyName, Control[] dependentControls) {
- treeViewer.expandAll();
- synchComposite(treeViewer.getControl(), propertyName, dependentControls);
- if (null == checkBoxViewerStateListener) {
- checkBoxViewerStateListener = new CheckBoxViewerListener();
- }
- treeViewer.addCheckStateListener(checkBoxViewerStateListener);
- }
-
- public void synchRadio(Button radio, String propertyName, Control[] dependentControls) {
- // Uses checkbox syncher
- synchCheckbox(radio, propertyName, dependentControls);
- }
-
- private TimedModifyListener getTimedListener() {
- if (timedModifyListener == null)
- timedModifyListener = new TimedModifyListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- Widget w = (Widget) e.getSource();
- if (currentWidget == w || w.isDisposed())
- return;
- String propertyName = (String) widgetToPropertyHash.get(w);
- setTextProperty(propertyName, (Text) w);
- }
- }) {
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- super.modifyText(e);
- }
- };
- return timedModifyListener;
- }
-
- protected void setTextProperty(String propertyName, Text text) {
- setProperty(propertyName, text.getText());
- }
-
- private ModifyTextListener getModifyTextListener() {
- if (null == modifyTextListener)
- modifyTextListener = new ModifyTextListener();
- return modifyTextListener;
- }
-
- public IDataModel getDataModel() {
- return dataModel;
- }
-
- public void dispose() {
- dataModel.removeListener(this);
- checkboxSelectionListener = null;
- currentWidget = null;
- modifyTextListener = null;
- propertyToWidgetHash = null;
- timedModifyListener = null;
- widgetToDepControls = null;
- widgetToPropertyHash = null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizard.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizard.java
deleted file mode 100644
index edf2fb6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizard.java
+++ /dev/null
@@ -1,378 +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.frameworks.internal.datamodel.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
-
-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.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.IDataModelPausibleOperation;
-import org.eclipse.wst.common.frameworks.internal.dialog.ui.WarningDialog;
-import org.eclipse.wst.common.frameworks.internal.eclipse.ui.EclipseEnvironment;
-import org.eclipse.wst.common.frameworks.internal.ui.ErrorDialog;
-import org.eclipse.wst.common.frameworks.internal.ui.PageGroupManager;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-
-/**
- * This class is EXPERIMENTAL and is subject to substantial changes.
- */
-public abstract class DataModelWizard extends Wizard implements IDMPageHandler {
- private PageGroupManager pageGroupManager;
- private IDataModel dataModel;
- private AddablePageGroup rootPageGroup;
- private IDataModelPausibleOperation rootOperation;
-
- // private IWizardPage firstpage;
-
- public DataModelWizard(IDataModel dataModel) {
- this.dataModel = dataModel;
- }
-
- public DataModelWizard() {
- }
-
- protected abstract IDataModelProvider getDefaultProvider();
-
- /**
- * @return the wizard ID that clients should extend to add to this wizard
- */
- public final String getWizardID() {
- return getDataModel().getID();
- }
-
- /**
- *
- * @return returns the root operation for this wizard.
- */
- protected IDataModelPausibleOperation getRootOperation() {
- return (IDataModelPausibleOperation)getDataModel().getDefaultOperation();
- }
-
- /**
- * This is finalized to handle the adding of extended pages. Clients should override
- * doAddPages() to add their pages.
- */
- public final void addPages() {
- init();
- doAddPages();
- }
-
- /**
- * Subclasses should override this method to add pages.
- */
- protected void doAddPages() {
- }
-
- // TODO make this final
- public IWizardPage getStartingPage() {
- pageGroupManager.reset();
- return getNextPage(null);
- }
-
- /**
- * Subclasses wishing to control the page ordering should do so by overriding
- * getNextPage(String, String) and getPreviousPage(String, String)
- *
- * @link #getNextPage(String, String)
- * @link #getPreviousPage(String, String)
- */
- // TODO make this final
- public IWizardPage getNextPage(IWizardPage page) {
-
- IWizardPage currentPage = pageGroupManager.getCurrentPage();
-
- pageGroupManager.moveForwardOnePage();
-
- IWizardPage nextPage = pageGroupManager.getCurrentPage();
-
- // If an error occured then the current page and the next page will be the same.
- if (currentPage != nextPage && nextPage != null) {
- nextPage.setWizard(this);
- nextPage.setPreviousPage(currentPage);
- }
-
- return currentPage == nextPage ? null : nextPage;
- }
-
- public String getNextPage(String currentPageName, String expectedNextPageName) {
- return expectedNextPageName;
- }
-
- /**
- * Subclasses wishing to control the page ordering should do so by overriding
- * getNextPage(String, String) and getPreviousPage(String, String)
- *
- * @link #getNextPage(String, String)
- * @link #getPreviousPage(String, String)
- */
- // TODO make this final
- public IWizardPage getPreviousPage(IWizardPage page) {
- return page != null ? page.getPreviousPage() : null;
- }
-
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
- return expectedPreviousPageName;
- }
-
- public boolean canFinish() {
- if (!super.canFinish() || !getDataModel().isValid()) {
- return false;
- }
-
- return true;
- }
-
- public PageGroupManager getPageGroupManager() {
- return pageGroupManager;
- }
-
- // TODO need to implement this. Perhaps in the PageGroupManager
- //
- protected void resetAfterFinishError() {
- // IWizardPage[] pages = getPages();
- // for (int i = 0; i < pages.length; i++) {
- // DataModelWizardPage wtpPage = (DataModelWizardPage) pages[i];
- // wtpPage.validatePage(true);
- // }
- }
-
- protected boolean isExecuting() {
- return executing;
- }
-
- private boolean executing = false;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public final boolean performFinish() {
- try {
- executing = true;
- if (prePerformFinish()) {
- storeDefaultSettings();
-
- final IStatus st = runOperations();
-
- if (st.getSeverity() == IStatus.ERROR) {
- WTPUIPlugin.log(st);
- ErrorDialog.openError(getShell(), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_0, new Object[]{getWindowTitle()}), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_1, new Object[]{getWindowTitle()}), new CoreException(st), 0, false);
- } else if(st.getSeverity() == IStatus.WARNING){
- WarningDialog.openWarning(getShell(), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_2, new Object[]{getWindowTitle()}), st.getMessage(), st, IStatus.WARNING);
- }
-
- postPerformFinish();
- }
- } catch (Exception exc) {
- WTPUIPlugin.log(exc);
- ErrorDialog.openError(getShell(), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_0, new Object[]{getWindowTitle()}), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_1, new Object[]{getWindowTitle()}), exc, 0, false);
- } finally {
- executing = false;
- }
-
- return true;
- }
-
- private IStatus runOperations() {
- final IStatus[] status = new IStatus[1];
- class CatchThrowableRunnableWithProgress implements IRunnableWithProgress {
- public Throwable caught = null;
-
- public void run(IProgressMonitor pm) {
- try {
- if (rootOperation == null) {
- //This will be the typical case because most wizards will
- //not initialize the root operation during init.
- rootOperation = getRootOperation();
- }
- status[0] = rootOperation.execute(pm, null);
- } catch (Throwable e) {
- caught = e;
- }
- }
- }
- CatchThrowableRunnableWithProgress runnable = new CatchThrowableRunnableWithProgress();
-
- try {
- getContainer().run(runForked(), isCancelable(), runnable);
- } catch (Throwable e) {
- runnable.caught = e;
- }
- if (runnable.caught != null) {
- Logger.getLogger().logError(runnable.caught);
- status[0] = new Status(IStatus.ERROR, "id", 0, runnable.caught.getMessage(), runnable.caught); //$NON-NLS-1$
- ErrorDialog.openError(getShell(), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_0, new Object[]{getWindowTitle()}), WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WTPWizard_UI_1, new Object[]{getWindowTitle()}), runnable.caught, 0, false);
- }
- return status[0];
- }
-
- public boolean performCancel() {
- pageGroupManager.undoAllCurrentOperations();
-
- return true;
- }
-
- /**
- * Subclass can override to perform any tasks prior to running the operation. Return true to
- * have the operation run and false to stop the execution of the operation.
- *
- * @return
- */
- protected boolean prePerformFinish() {
- return true;
- }
-
- /**
- * Subclasses should override to perform any actions necessary after performing Finish.
- */
- protected void postPerformFinish() throws InvocationTargetException {
- }
-
- protected void storeDefaultSettings() {
- pageGroupManager.storeDefaultSettings(this);
- }
-
- public void storeDefaultSettings(IWizardPage page) {
- if (page instanceof DataModelWizardPage)
- ((DataModelWizardPage) page).storeDefaultSettings();
- }
-
-
- /**
- * Subclasses may override if they need to do something special when storing the default
- * settings for a particular page.
- *
- * @param page
- * @param pageIndex
- */
- protected void storeDefaultSettings(IWizardPage page, int pageIndex) {
- storeDefaultSettings(page);
- }
-
- /**
- * Subclasses should override if the running operation is allowed to be cancelled. The default
- * is false.
- *
- * @return
- */
- protected boolean isCancelable() {
- return false;
- }
-
- /**
- * Subclasses should override to return false if the running operation cannot be run forked.
- *
- * @return
- */
- protected boolean runForked() {
- return true;
- }
-
- public void setDataModel(IDataModel model) {
- this.dataModel = model;
- }
-
- /**
- * @return Returns the model.
- */
- public IDataModel getDataModel() {
- if (null == dataModel) {
- dataModel = DataModelFactory.createDataModel(getDefaultProvider());
- }
-
- return dataModel;
- }
-
- public void dispose() {
- super.dispose();
- if (null != rootPageGroup) {
- List pages = rootPageGroup.getPages(dataModel);
- for (Iterator it = pages.iterator(); it.hasNext();)
- {
- Object page = it.next();
- if (page instanceof IWizardPage)
- {
- ((IWizardPage)page).dispose();
- }
- }
- }
- if (null != dataModel) {
- dataModel.dispose();
- }
- }
-
- /**
- * The default is to return a SimplePageGroup. Subclasses may want to overrided this method to
- * return a different root page group for the wizard.
- *
- * @return
- */
- protected AddablePageGroup createRootPageGroup() {
- String id = getWizardID();
- // For the root page group the wizard id and the group id are the same.
- SimplePageGroup pageGroup = new SimplePageGroup(id, id);
- pageGroup.setPageHandler(this);
- return pageGroup;
- }
-
- /**
- * Creates the default environment for this wizard.
- *
- * @return
- */
- protected IEnvironment createEnvironment() {
- return new EclipseEnvironment();
- }
-
- public void addPage(IWizardPage page) {
- rootPageGroup.addPage(page);
- }
-
- private void init() {
- rootPageGroup = createRootPageGroup();
- if (needsToRunOperationsBeforeFinish()) {
- rootOperation = getRootOperation();
- pageGroupManager = new PageGroupManager(rootOperation, rootPageGroup);
- } else {
- pageGroupManager = new PageGroupManager(getDataModel(), rootPageGroup);
- }
- }
-
- /**
- * Subclasses should override to return true if they require the running
- * of the operation during page turning.
- *
- * @return A boolean defaulted to false.
- */
- protected boolean needsToRunOperationsBeforeFinish() {
- return false;
- }
-
- public boolean needsPreviousAndNextButtons() {
- return super.needsPreviousAndNextButtons() || getPageGroupManager().hasMultiplePages();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardFactory.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardFactory.java
deleted file mode 100644
index eec76f6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardFactory.java
+++ /dev/null
@@ -1,65 +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.frameworks.internal.datamodel.ui;
-
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.DataModelWizardExtensionReader;
-
-public class DataModelWizardFactory {
-
- private static DataModelWizardExtensionReader reader;
-
- /**
- * Looks up the appropriate DataModelWizard by the specified id and
- * constructs a new DataModelWizard using a new instance of the IDataModel
- * looked up with the same id. If the DataModelWizard is not found then a
- * RuntimeException is thrown.
- *
- * @param id
- * the id of the DataModelWizard
- * @return a new DataModelWizard
- */
- public static DataModelWizard createWizard(String id) {
- return createWizard(DataModelFactory.createDataModel(id));
- }
-
- /**
- * Looks up the appropriate DataModelWizard using the id retured from
- * <code>dataModel.getID()</code>.
- *
- * @param dataModel
- * @return a new DataModelWizard
- */
- public static DataModelWizard createWizard(IDataModel dataModel) {
- return loadWizard(dataModel);
- }
-
- private static DataModelWizard loadWizard(IDataModel dataModel) {
- if (null == reader) {
- reader = new DataModelWizardExtensionReader();
- }
- return reader.getWizard(dataModel);
- }
-
- /**
- * Looks up the appropriate DataModelWizard using the name of the specified
- * class as the id. This method is equavalent to
- * <code>createWizard(classID.getName())</code>.
- *
- * @param classID
- * the class whose name is the id of the DataModelWizard
- * @return a new DataModelWizard
- */
- public static DataModelWizard createWizard(Class dataModelProviderID) {
- return createWizard(dataModelProviderID.getName());
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardPage.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardPage.java
deleted file mode 100644
index ec057a4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/DataModelWizardPage.java
+++ /dev/null
@@ -1,463 +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.common.frameworks.internal.datamodel.ui;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.ui.ValidationStatus;
-
-/**
- * This class is EXPERIMENTAL and is subject to substantial changes.
- */
-public abstract class DataModelWizardPage extends WizardPage implements Listener, IDataModelListener {
- protected static final int NEXT = 1;
- protected static final int PREVIOUS = 2;
- protected static final int COMPOSITE_BORDER = SWT.NULL;
- private ValidationStatus status = new ValidationStatus();
- private boolean isValidating = false;
- protected boolean isFirstTimeToPage = true;
- protected IDataModel model;
- private Map validationMap;
- private String[] validationPropertyNames;
- protected DataModelSynchHelper synchHelper;
- private String infopopID;
- private DataModelWizard wizard;
- private IWizardPage previousPage;
-
- /**
- * J2EEWizardPage constructor comment.
- *
- * @param pageName
- * java.lang.String
- */
- protected DataModelWizardPage(IDataModel model, String pageName) {
- super(pageName);
- this.model = model;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
- /**
- * @return
- */
- public DataModelSynchHelper initializeSynchHelper(IDataModel dm) {
- return new DataModelSynchHelper(dm);
- }
-
- /**
- * J2EEWizardPage constructor comment.
- *
- * @param pageName
- * java.lang.String
- * @param title
- * java.lang.String
- * @param titleImage
- * org.eclipse.jface.resource.ImageDescriptor
- */
- protected DataModelWizardPage(IDataModel model, String pageName, String title, org.eclipse.jface.resource.ImageDescriptor titleImage) {
- super(pageName, title, titleImage);
- this.model = model;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
- /**
- * Creates the top level control for this dialog page under the given parent composite. This
- * method has been abstract and it uses the template pattern to get the correct items setup in
- * the correct order. See the set of methods below that are called in this method.
- * <p>
- * Implementors are responsible for ensuring that the created control can be accessed via
- * <code>getControl</code>
- * </p>
- *
- * @param parent
- * the parent composite
- */
- public final void createControl(org.eclipse.swt.widgets.Composite parent) {
- Composite top = createTopLevelComposite(parent);
- setControl(top);
- setupInfopop(top);
- setDefaults();
- addListeners();
- initializeValidationProperties();
- }
-
- private void initializeValidationProperties() {
- validationPropertyNames = getValidationPropertyNames();
- if (validationPropertyNames == null || validationPropertyNames.length == 0)
- validationMap = Collections.EMPTY_MAP;
- else {
- validationMap = new HashMap(validationPropertyNames.length);
- for (int i = 0; i < validationPropertyNames.length; i++)
- validationMap.put(validationPropertyNames[i], new Integer(i));
- }
- }
-
- public boolean canFlipToNextPage() {
- // TODO why is that last getNextPage() call here???
- return isPageComplete() && ((null != wizard && wizard.getPageGroupManager().hasNextPage() || null != getNextPage()));
- }
-
- /*
- * (non-Javadoc) Method declared on IWizardPage.
- */
- public void setWizard(IWizard newWizard) {
- super.setWizard(newWizard);
- if (newWizard instanceof DataModelWizard) {
- wizard = (DataModelWizard) newWizard;
- }
- }
-
- public IWizardPage getPreviousPage() {
- return previousPage;
- }
-
- public void setPreviousPage(IWizardPage page) {
- super.setPreviousPage(page);
- previousPage = page;
- }
-
- /**
- * Subclass should return the model property names that need to be validated on this page in the
- * order that they should present their messages.
- *
- * @return
- */
- protected abstract String[] getValidationPropertyNames();
-
- /**
- * Return the top level Composite for this page.
- */
- protected abstract Composite createTopLevelComposite(Composite parent);
-
- /**
- * Set up info pop hooks if set.
- */
- protected void setupInfopop(Control parent) {
- if (getInfopopID() != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, getInfopopID());
- }
-
- /**
- * Setup the default values for this page. Subclasses should override to provide appropriate
- * defaults.
- */
- protected void setDefaults() {
- restoreDefaultSettings();
- }
-
- /**
- * Subclasses should implement this method if they have default settings that have been stored
- * and need to be restored.
- *
- * @see storeDefaultSettings()
- */
- protected void restoreDefaultSettings() {
- }
-
- /**
- * Add Listeners to controls at this point to avoid unnecessary events. Subclasses should
- * override to add listeners to its controls.
- */
- protected void addListeners() {
- }
-
- /**
- * The page is being made current and visible. Subclasses may extend.
- */
- protected void enter() {
- try {
- // Check to see if we are moving back one page.
- if (null != wizard && wizard.getPreviousPage(wizard.getPageGroupManager().getCurrentPage()) == this) {
- wizard.getPageGroupManager().moveBackOnePage();
- }
-
- validatePage(showValidationErrorsOnEnter());
- } finally {
- isFirstTimeToPage = false;
- }
- }
-
- /**
- * The default behavior is to return true unless it is the first time entering this page in
- * which case we check to see if there is a previous page and return true if there is not.
- * Subclasses should override if they do not want this default behavior.
- */
- protected boolean showValidationErrorsOnEnter() {
- return !isFirstTimeToPage();
- }
-
- /**
- * The default behavior is to return true unless it is the first time entering this page in
- * which case we check to see if there is a previous page and return true if there is not.
- * Subclasses should override if they do not want this default behavior.
- *
- * @deprecated - use showValidatoinErrorsOnEnter instead
- */
- protected boolean shouldValidateOnEnter() {
- return showValidationErrorsOnEnter();
- }
-
- /**
- * Exiting the page. Subclasses may extend.
- */
- protected void exit() {
- }
-
- protected boolean getStatus(Integer key) {
- return status.hasError(key);
- }
-
- /**
- * Sent when an event that the receiver has registered for occurs. If a subclass overrides this
- * method, it must call super.
- *
- * @param event
- * the event which occurred
- */
- public void handleEvent(org.eclipse.swt.widgets.Event event) {
- }
-
- /**
- * Set the error message for this page based on the last error in the ValidationStatus.
- */
- protected void setErrorMessage() {
- String error = status.getLastErrMsg();
- if (error == null) {
- if (getErrorMessage() != null)
- setErrorMessage((String) null);
- String warning = status.getLastWarningMsg();
- if (warning == null) {
- if (getMessage() != null && getMessageType() == IMessageProvider.WARNING)
- setMessage(null, IMessageProvider.WARNING);
- else {
- String info = status.getLastInfoMsg();
- if (info == null) {
- if (getMessage() != null && getMessageType() == IMessageProvider.INFORMATION)
- setMessage(null, IMessageProvider.INFORMATION);
- } else if (!info.equals(getMessage())) {
- setMessage(info, IMessageProvider.INFORMATION);
- }
- }
- } else if (!warning.equals(getMessage()))
- setMessage(warning, IMessageProvider.WARNING);
- } else if (!error.equals(getErrorMessage()))
- setErrorMessage(error);
- }
-
- protected void setErrorStatus(Integer key, String errorMessage) {
- status.setErrorStatus(key, errorMessage);
- }
-
- protected void setWarningStatus(Integer key, String warningMessage) {
- status.setWarningStatus(key, warningMessage);
- }
-
- protected void setInfoStatus(Integer key, String infoMessage) {
- status.setInfoStatus(key, infoMessage);
- }
-
- protected void setOKStatus(Integer key) {
- status.setOKStatus(key);
- }
-
- /**
- * The <code>DialogPage</code> implementation of this <code>IDialogPage</code> method sets
- * the control to the given visibility state. Subclasses may extend.
- */
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible) {
- enter();
- } else
- exit();
- }
-
- /**
- * This should be called by the Wizard just prior to running the performFinish operation.
- * Subclasses should override to store their default settings.
- */
- public void storeDefaultSettings() {
- }
-
- /**
- * The page is now being validated. At this time, each control is validated and then the
- * controls are updated based on the results in the ValidationStatus which was updated during
- * <code>validateControls()</code>. Finally, it will display the last error message and it
- * will set the page complete. Subclasses will not typically override this method.
- */
- protected void validatePage() {
- validatePage(true);
- }
-
- protected void validatePage(boolean showMessage) {
- if (!isValidating) {
- isValidating = true;
- try {
- validateControlsBase();
- updateControls();
- if (showMessage)
- setErrorMessage();
- setPageComplete(status.getLastErrMsg() == null);
- } finally {
- isValidating = false;
- }
- }
- }
-
- /**
- * Validate individual controls. Use validation keys to keep track of errors.
- *
- * @see setOKStatus(Integer) and setErrorMessage(Integer, String)
- */
- protected final String validateControlsBase() {
- if (!validationMap.isEmpty()) {
- String propName;
- for (int i = 0; i < validationPropertyNames.length; i++) {
- propName = validationPropertyNames[i];
- Integer valKey = (Integer) validationMap.get(propName);
- if (valKey != null)
- validateProperty(propName, valKey);
- if (!getStatus(valKey))
- return propName;
- }
- }
- return null;
- }
-
- /**
- * @param propertyName
- * @param validationkey
- */
- private void validateProperty(String propertyName, Integer validationKey) {
- setOKStatus(validationKey);
- IStatus status1 = model.validateProperty(propertyName);
- if (!status1.isOK()) {
- String message = status1.isMultiStatus() ? status1.getChildren()[0].getMessage() : status1.getMessage();
- switch (status1.getSeverity()) {
- case IStatus.ERROR :
- setErrorStatus(validationKey, message);
- break;
- case IStatus.WARNING :
- setWarningStatus(validationKey, message);
- break;
- case IStatus.INFO :
- setInfoStatus(validationKey, message);
- break;
- }
- }
- }
-
- /**
- * Update the enablement of controls after validation. Sublcasses should check the status of
- * validation keys to determine enablement.
- */
- protected void updateControls() {
- }
-
- /**
- * Gets the isFirstTimeToPage.
- *
- * @return Returns a boolean
- */
- protected boolean isFirstTimeToPage() {
- return isFirstTimeToPage;
- }
-
- // protected void setJavaStatusMessage(IStatus javaStatus, Integer statusKey, String message) {
- // if (javaStatus.getSeverity() == IStatus.WARNING)
- // setWarningStatus(statusKey, message);
- // else
- // setErrorStatus(statusKey, message);
- // }
-
- /**
- * @param b
- */
- public void setFirstTimeToPage(boolean b) {
- isFirstTimeToPage = b;
- }
-
- private boolean gotDataModelWizard = false;
- private DataModelWizard dataModelWizard = null;
- protected DataModelWizard getDataModelWizard(){
- if(!gotDataModelWizard){
- gotDataModelWizard = true;
- IWizard wizard = getWizard();
- if(wizard instanceof DataModelWizard){
- dataModelWizard = (DataModelWizard)wizard;
- }
- }
- return dataModelWizard;
- }
-
-
- /*
- * If a property changes that we want to validate, force validation on this page.
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelListener#propertyChanged(java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void propertyChanged(DataModelEvent event) {
- DataModelWizard w = getDataModelWizard();
- if(w == null || !w.isExecuting()){
- String propertyName = event.getPropertyName();
- if (validationPropertyNames != null && (event.getFlag() == DataModelEvent.VALUE_CHG || (!isPageComplete() && event.getFlag() == DataModelEvent.VALID_VALUES_CHG))) {
- for (int i = 0; i < validationPropertyNames.length; i++) {
- if (validationPropertyNames[i].equals(propertyName)) {
- validatePage(showValidationErrorsOnEnter());
- break;
- }
- }
- }
- }
- }
-
- /**
- * @return Returns the model.
- */
- protected IDataModel getDataModel() {
- return model;
- }
-
- public void dispose() {
- super.dispose();
- if (synchHelper != null) {
- synchHelper.dispose();
- synchHelper = null;
- }
- }
-
- protected String getInfopopID() {
- return infopopID;
- }
-
- public void setInfopopID(String infopopID) {
- this.infopopID = infopopID;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroup.java
deleted file mode 100644
index f2105c6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroup.java
+++ /dev/null
@@ -1,34 +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.frameworks.internal.datamodel.ui;
-
-import java.util.List;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public interface IDMPageGroup
-{
- public String getWizardID();
-
- public String getPageGroupID();
-
- public String getPageGroupInsertionID();
-
- public boolean getAllowsExtendedPages();
-
- public String getRequiredDataOperationToRun();
-
- public List getPages(IDataModel dataModel);
-
- public IDMPageHandler getPageHandler( IDataModel dataModel );
-
- public IDMPageGroupHandler getPageGroupHandler( IDataModel dataModel );
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroupHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroupHandler.java
deleted file mode 100644
index c170e5c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageGroupHandler.java
+++ /dev/null
@@ -1,63 +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.frameworks.internal.datamodel.ui;
-
-/**
- *
- * The wizard framework allows page groups to be inserted after other page group.
- * If more than one page group inserts itself after a particular page group it may
- * not be deterministic which page group should follow each other. This class
- * allows a particular page group to determine the order in which subsequent page
- * groups should be ordered.
- *
- * For example: A page group T has three page groups X, Y, and Z that have registered
- * via the wizardPageGroup extension point to follow it.
- * The wizard framework will call getNextGroup with:
- *
- * T.getNextGroup( null, { "X", "Y", "Z" } )
- *
- * This method should return either "X", "Y", "Z", or null if no page group
- * should follow. If "Y" was returned then a subequent call
- * will be made by the framework with:
- *
- * T.getNextGroup( "Y", { "X", "Y", "Z" } )
- *
- * Again this method should return either "X", "Y", "Z", or null if no page
- * group should follow this page group "Y".
- *
- * Note: any page group can have a page group handler associated with it so this method
- * call is recursive in nature. For example: the page group Y might have page
- * groups Y1, Y2, and Y3 following it. This would result in the following calls:
- *
- * T.getNextGroup( null, { "X", "Y", "Z" } ) // "Y" is selected using Ts handler.
- * Y.getNextGroup( null, { "Y1", "Y2", "Y3" } ) // "Y1" is selected using Ys handler.
- *
- * For this example Y1 has no page groups following it.
- *
- * T.getNextGroup( "Y", { "X", "Y", "Z" } ) // null is selected using Ts handler.
- *
- * For this example, the T handler decided that no page group followed Y not even X or Z.
- *
- */
-public interface IDMPageGroupHandler
-{
- /**
- *
- * @param currentPageGroupID the current page group ID. This value will be null the first time
- * this method is called.
- * @param pageGroupIDs a list of page group IDs that follow the page group for this handler.
- * @return returns the page group id that should follow currentPageGroupID, or it
- * should return null if no page group follows currentPageGroupID.
- *
- */
- public String getNextPageGroup( String currentPageGroupID, String[] pageGroupIDs );
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageHandler.java
deleted file mode 100644
index a4419a3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/IDMPageHandler.java
+++ /dev/null
@@ -1,59 +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.frameworks.internal.datamodel.ui;
-
-/**
- * This interface is EXPERIMENTAL and is subject to substantial changes.
- */
-public interface IDMPageHandler {
-
- /**
- * return this as the page name if the expectedNextPageName or expectedPreviousPageName should
- * be skipped
- */
- public static final String SKIP_PAGE = "IDMExtendedPageHandler.SKIP_PAGE"; //$NON-NLS-1$
-
- /**
- * prefix this string with the name of the page which occurs before the page that should be
- * returned. E.G. suppose your page contributions know about pages A, B and C, and you want the
- * to skip pages B and C, when going to the next page from A. To do this, return PAGE_AFTER+C.
- * The framework will then ask the wizard for the page that normally comes after page C.
- * PAGE_BEFORE works similarly.
- */
- public static final String PAGE_AFTER = "IDMExtendedPageHandler.PAGE_AFTER"; //$NON-NLS-1$
-
- /**
- * same as PAGE_AFTER, except for returing the page before.
- */
- public static final String PAGE_BEFORE = "IDMExtendedPageHandler.PAGE_BEFORE"; //$NON-NLS-1$
-
- /**
- * Return the name of the page that should be next
- *
- * @param currentPageName
- * the page the wizard is currently on
- * @param expectedNextPageName
- * the page that would normally be next
- * @return
- */
- public String getNextPage(String currentPageName, String expectedNextPageName);
-
- /**
- * Return the name of the page that should be previous
- *
- * @param currentPageName
- * the page the wizard is currently on
- * @param expectedNextPageName
- * the page that would normally be previous
- * @return
- */
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName);
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
deleted file mode 100644
index 0e936ef..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/datamodel/ui/SimplePageGroup.java
+++ /dev/null
@@ -1,102 +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.frameworks.internal.datamodel.ui;
-
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class SimplePageGroup implements AddablePageGroup {
- private String groupID;
- private String wizardID;
- private boolean allowExtendedPages;
- private String requiredDataOperation;
- private Set dataModelIDs;
-
- private IDMPageHandler pageHandler;
- private IDMPageGroupHandler pageGroupHandler;
- private Vector pages;
-
- public SimplePageGroup(String groupID, String wizardID, boolean allowExtendedPages, String requireDataOperation) {
- this.groupID = groupID;
- this.wizardID = wizardID;
- this.allowExtendedPages = allowExtendedPages;
- this.requiredDataOperation = requireDataOperation;
- pages = new Vector();
- }
-
- public SimplePageGroup(String groupID, String wizardID) {
- this(groupID, wizardID, true, null);
- }
-
- public void addPage(IWizardPage page) {
- pages.add(page);
- }
-
- public void addPages(IWizardPage[] newPages) {
- for (int index = 0; index < newPages.length; index++) {
- pages.add(newPages[index]);
- }
- }
-
- public boolean getAllowsExtendedPages() {
- return allowExtendedPages;
- }
-
- public void setPageGroupHandler(IDMPageGroupHandler handler) {
- pageGroupHandler = handler;
- }
-
- public IDMPageGroupHandler getPageGroupHandler(IDataModel dataModel) {
- return pageGroupHandler;
- }
-
- public void setPageHandler(IDMPageHandler handler) {
- pageHandler = handler;
- }
-
- public IDMPageHandler getPageHandler(IDataModel dataModel) {
- return pageHandler;
- }
-
- public List getPages(IDataModel dataModel) {
- return pages;
- }
-
- public IWizardPage[] getExtendedPages(IDataModel dataModel) {
- return (IWizardPage[]) pages.toArray(new IWizardPage[0]);
- }
-
- public String getPageGroupID() {
- return groupID;
- }
-
- public String getPageGroupInsertionID() {
- return null;
- }
-
- public String getRequiredDataOperationToRun() {
- return requiredDataOperation;
- }
-
- public String getWizardID() {
- return wizardID;
- }
-
- public Set getDataModelIDs() {
- return dataModelIDs;
- }
-
- public void setDataModelIDs(Set dataModelIDs) {
- this.dataModelIDs = dataModelIDs;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/ErrorDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/ErrorDialog.java
deleted file mode 100644
index 620d136..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/ErrorDialog.java
+++ /dev/null
@@ -1,99 +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.common.frameworks.internal.dialog.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class ErrorDialog extends MessageDialog
-{
-
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public ErrorDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() || status.getException() != null )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/InfoDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/InfoDialog.java
deleted file mode 100644
index cfc565a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/InfoDialog.java
+++ /dev/null
@@ -1,98 +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.common.frameworks.internal.dialog.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class InfoDialog extends MessageDialog
-{
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public InfoDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/MessageDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/MessageDialog.java
deleted file mode 100644
index 8d48622..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/MessageDialog.java
+++ /dev/null
@@ -1,636 +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.common.frameworks.internal.dialog.ui;
-
-import java.io.BufferedReader;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class MessageDialog extends Dialog
-{
- protected Composite parent;
-
- /**
- * Reserve room for this many list items.
- */
- protected static final int LIST_ITEM_COUNT = 7;
-
- /**
- * The Details button.
- */
- protected Button detailsButton;
-
- /**
- * The title of the dialog.
- */
- protected String title;
-
- /**
- * The message to display.
- */
- protected String message;
-
- /**
- * The SWT list control that displays the error details.
- */
- protected List list;
- protected Text details;
-
- /**
- * Indicates whether the error details viewer is currently created.
- */
- protected boolean listCreated = false;
- protected boolean detailsCreated = false;
-
- /**
- * Filter mask for determining which status items to display.
- */
- protected int displayMask = 0xFFFF;
-
- /**
- * The main status object.
- */
- protected IStatus status;
-
- private Point savedSize = null;
-
- /**
- * List of the main error object's detailed errors (element type: <code>Status</code>).
- */
- protected java.util.List statusList;
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public MessageDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell);
- this.title = dialogTitle == null ? JFaceResources.getString("Problem_Occurred") : //$NON-NLS-1$
- dialogTitle;
- this.message = message == null ? status.getMessage() : JFaceResources.format("Reason", new Object[] { message, status.getMessage()}); //$NON-NLS-1$
- this.status = status;
- statusList = Arrays.asList(status.getChildren());
- this.displayMask = displayMask;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
- /*
- * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or
- * Details button in this dialog. If the Ok button was pressed then close
- * this dialog. If the Details button was pressed then toggle the displaying
- * of the error details area. Note that the Details button will only be
- * visible if the error being displayed specifies child details.
- */
- protected void buttonPressed(int id)
- {
- if (id == StatusDialogConstants.DETAILS_ID)
- { // was the details button pressed?
- toggleDetailsArea();
- }
- else
- {
- super.buttonPressed(id);
- }
- }
- /*
- * (non-Javadoc) Method declared in Window.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(title);
- }
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() || status.getException() != null )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
-
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog. Creates and returns the contents
- * of the upper part of the dialog (above the button bar).
- */
- protected Control createDialogArea(Composite parent)
- {
- this.parent = parent;
-
- // create composite
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite imageAndLabel = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- imageAndLabel.setLayout(gl);
- composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
- // create image
- Image image = getDialogImage();
- if (image != null)
- {
- Label label = new Label(imageAndLabel, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(
- new GridData(
- GridData.HORIZONTAL_ALIGN_CENTER
- | GridData.VERTICAL_ALIGN_BEGINNING));
- }
-
- // create message
- if (message != null)
- {
- Text text = new Text(imageAndLabel, SWT.READ_ONLY|SWT.WRAP);
- text.setText(message);
- GridData data =
- new GridData(
- GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL
- | GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint =
- convertHorizontalDLUsToPixels(
- IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-
- text.setLayoutData(data);
- text.setFont(parent.getFont());
- }
-
- return composite;
- }
-
- protected List createDropDownList(Composite parent)
- {
- // create the list
- list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
- // fill the list
- populateList(list);
-
- GridData data =
- new GridData(
- GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL
- | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
- data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
- list.setLayoutData(data);
- listCreated = true;
- return list;
- }
- protected Text createDropDownDetails(Composite parent)
- {
- details = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY);
- //details.setEditable(false);
- Color color = new Color(parent.getShell().getDisplay(), 255, 255, 255);
- details.setBackground(color);
- populateDetails(details, status, 0);
- GridData data =
- new GridData(
- GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL
- | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
- details.setLayoutData(data);
- details.setSelection(0);
- detailsCreated = true;
- return details;
- }
- /*
- * (non-Javadoc) Method declared on Window.
- */
- /**
- * Extends <code>Window.open()</code>. Opens an error dialog to display
- * the error. If you specified a mask to filter the displaying of these
- * children, the error dialog will only be displayed if there is at least one
- * child status matching the mask.
- */
- public int open()
- {
- if (shouldDisplay(status, displayMask))
- {
- return super.open();
- }
- return 0;
- }
- /**
- * This essentially does the work of a factory Opens an error dialog to
- * display the given error. Use this method if the error object being
- * displayed does not contain child items, or if you wish to display all such
- * items without filtering.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- */
- public static int openMessage(
- Shell parent,
- String dialogTitle,
- String message,
- IStatus status)
- {
-
- switch (status.getSeverity())
- {
- case IStatus.INFO :
- return openInfo(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- case IStatus.WARNING :
- return openWarning(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- default :
- return openError(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- }
-
- }
-
- public static int openMessage(
- Shell parent,
- String dialogTitle,
- String message,
- IStatus status,
- Choice[] options)
- {
-
- return openOptions(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
- options);
- }
-
- /**
- * Opens an error dialog to display the given error. Use this method if the
- * error object being displayed contains child items <it>and</it> you wish
- * to specify a mask which will be used to filter the displaying of these
- * children. The error dialog will only be displayed if there is at least one
- * child status matching the mask.
- *
- * @param parentShell
- * the parent shell of the dialog, or <code>null</code> if none
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- */
- public static int openError(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- ErrorDialog dialog =
- new ErrorDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openInfo(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- InfoDialog dialog =
- new InfoDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openWarning(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- WarningDialog dialog =
- new WarningDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openOptions(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask,
- Choice[] options)
- {
- OptionsDialog dialog =
- new OptionsDialog(
- parentShell,
- title,
- message,
- status,
- displayMask,
- options);
- dialog.open();
- return dialog.getReturnCode();
- }
-
- /**
- * Populates the list using this error dialog's status object. This walks the
- * child stati of the status object and displays them in a list. The format
- * for each entry is status_path : status_message If the status's path was
- * null then it (and the colon) are omitted.
- */
- private void populateList(List list)
- {
- Iterator enumeration = statusList.iterator();
- while (enumeration.hasNext())
- {
- IStatus childStatus = (IStatus) enumeration.next();
- populateList(list, childStatus, 0);
- }
- }
- private void populateList(List list, IStatus status, int nesting)
- {
- if (!status.matches(displayMask))
- {
- return;
- }
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < nesting; i++)
- {
- sb.append(" "); //$NON-NLS-1$
- }
- sb.append(status.getMessage());
- list.add(sb.toString());
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- {
- populateList(list, children[i], nesting + 1);
- }
- }
- private void populateDetails(Text text, IStatus status, int nesting)
- {
- if (!status.matches(displayMask))
- {
- return;
- }
-
- String tabChars = repeat( ' ', nesting * 2 );
- String messageLine = tabChars + status.getMessage() + System.getProperty("line.separator"); //$NON-NLS-1$
- Throwable except = status.getException();
-
- text.append( messageLine );
-
- if( except != null )
- {
- String[] trace = getStackTrace( except );
-
- for( int index = 0; index < trace.length; index++ )
- {
- text.append( tabChars + " " + trace[index] + System.getProperty("line.separator") ); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- {
- populateDetails(text, children[i], nesting + 1);
- }
- }
- /**
- * Returns whether the given status object should be displayed.
- *
- * @param status
- * a status object
- * @param mask
- * a mask as per <code>Status.matches</code>
- * @return <code>true</code> if the given status should be displayed, and
- * <code>false</code> otherwise
- */
- protected static boolean shouldDisplay(IStatus status, int mask)
- {
- IStatus[] children = status.getChildren();
- if (children == null || children.length == 0)
- {
- return status.matches(mask);
- }
- for (int i = 0; i < children.length; i++)
- {
- if (children[i].matches(mask))
- return true;
- }
- return false;
- }
- /**
- * Toggles the unfolding of the details area. This is triggered by the user
- * pressing the details button.
- */
- private void toggleDetailsArea()
- {
- Point windowSize = getShell().getSize();
- int newHeight = -1;
-
- if (detailsCreated)
- {
- details.dispose();
- detailsCreated = false;
- detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-
- // Without the following computeSize call the setSize call below throws an array out of bounds exception.
- // Very weird.
- getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- newHeight = savedSize.y;
- }
- else
- {
- if( savedSize == null ) savedSize = windowSize;
-
- details = createDropDownDetails((Composite) getContents());
- detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- newHeight = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
- }
-
-
- newHeight = newHeight > 400 ? 400 : newHeight;
-
- getShell().setSize( new Point(windowSize.x, newHeight) );
- }
-
- private String[] getStackTrace( Throwable exc )
- {
- Vector lines = new Vector();
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter( stringWriter );
-
- exc.printStackTrace( printWriter );
-
- try
- {
- printWriter.close();
- stringWriter.close();
- }
- catch( Exception nestedExc )
- {
- return new String[0];
- }
-
- StringReader stringReader = new StringReader( stringWriter.toString() );
- BufferedReader reader = new BufferedReader( stringReader );
- String line = null;
-
- try
- {
- line = reader.readLine();
-
- while( line != null )
- {
- lines.add( line.trim() );
- line = reader.readLine();
- }
- }
- catch( Exception nestedExc )
- {
- return new String[0];
- }
-
- return (String[])lines.toArray( new String[0] );
- }
-
- private String repeat( char the_char, int count )
- {
- StringBuffer buf = new StringBuffer( count );
-
- for( int index = 0; index < count; index++ )
- {
- buf.append( the_char );
- }
-
- return buf.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/OptionsDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/OptionsDialog.java
deleted file mode 100644
index 21869b2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/OptionsDialog.java
+++ /dev/null
@@ -1,107 +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.common.frameworks.internal.dialog.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class OptionsDialog extends MessageDialog
-{
- private Choice[] choices;
- private int returnCode_;
-
- public OptionsDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask,
- Choice[] choices)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- this.choices = choices;
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create a button for each options
- for (int i = 0; i < choices.length; i++)
- {
- createButton(parent, choices[i].getShortcut(), choices[i].getLabel(), true);
- }
- if (status.isMultiStatus() )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- protected void buttonPressed(int id)
- {
- if (id == StatusDialogConstants.DETAILS_ID)
- // was the Details button pressed?
- super.buttonPressed(id);
- else
- {
- setReturnCode(id);
- close();
- }
- }
-
- protected void setReturnCode(int id)
- {
- returnCode_ = id;
- }
-
- public int getReturnCode()
- {
- return returnCode_;
- }
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- switch (status.getSeverity())
- {
- case IStatus.INFO :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- case IStatus.WARNING :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
- default :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/StatusDialogConstants.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/StatusDialogConstants.java
deleted file mode 100644
index e3ca36b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/StatusDialogConstants.java
+++ /dev/null
@@ -1,51 +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.common.frameworks.internal.dialog.ui;
-
-/**
-* Constants for status dialogs
-*/
-public interface StatusDialogConstants {
-
- /*
- * Button ID for the "Yes" button
- */
- public static final int YES_ID = 2;
- /*
- * Button ID for the "Yes to all" button
- */
- public static final int YES_TO_ALL_ID = 4;
- /*
- * Button ID for the "Cancel" button
- */
- public static final int CANCEL_ID = 1;
- /*
- * Button ID for the "OK" button
- */
- public static final int OK_ID = 0;
- /*
- * Button ID for the "Details" button
- */
- public static final int DETAILS_ID = 13;
-
- /*
- * Button label for the "Yes" button
- */
- // public static final String YES_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_LABEL");
- /*
- * Button label for the "Yes to all" button
- */
- // public static final String YES_TO_ALL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
- /*
- * Button label for the "Cancel" button
- */
- // public static final String CANCEL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/WarningDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/WarningDialog.java
deleted file mode 100644
index 6c66d82..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/dialog/ui/WarningDialog.java
+++ /dev/null
@@ -1,103 +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.common.frameworks.internal.dialog.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class WarningDialog extends MessageDialog
-{
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public WarningDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK, Cancel and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- createButton(
- parent,
- StatusDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL,
- false);
- if (status.isMultiStatus())
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseEnvironment.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseEnvironment.java
deleted file mode 100644
index 26bff48..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseEnvironment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.eclipse.ui;
-
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-
-
-/**
- * This class implements an IEnvironment class for the Eclipse IEnvironment.
- * This IEnvironment currently supports the "platform" protocol and the "file"
- * protocol.
- *
- */
-public class EclipseEnvironment implements IEnvironment
-{
- private SimpleURIFactory uriFactory_ = null;
- private IStatusHandler statusHandler_ = null;
- private ILog logger_ = null;
-
- public EclipseEnvironment()
- {
- this( new EclipseStatusHandler() );
- }
-
- public EclipseEnvironment( IStatusHandler statusHandler )
- {
- IURIScheme eclipseScheme = EnvironmentService.getEclipseScheme();
- IURIScheme fileScheme = EnvironmentService.getFileScheme();
-
- uriFactory_ = new SimpleURIFactory();
- statusHandler_ = statusHandler;
-
- uriFactory_.registerScheme( "platform", eclipseScheme ); //$NON-NLS-1$
- uriFactory_.registerScheme( "file", fileScheme ); //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IEnvironment#getLog()
- */
- public ILog getLog()
- {
- if( logger_ == null )
- {
- logger_ = EnvironmentService.getEclipseLog();
- };
-
- return logger_;
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IEnvironment#getStatusHandler()
- */
- public IStatusHandler getStatusHandler()
- {
- return statusHandler_;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.wst.common.environment.IEnvironment#getURIFactory()
- */
- public IURIFactory getURIFactory()
- {
- return uriFactory_;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseStatusHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseStatusHandler.java
deleted file mode 100644
index a8dc82e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/EclipseStatusHandler.java
+++ /dev/null
@@ -1,133 +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.common.frameworks.internal.eclipse.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.internal.dialog.ui.MessageDialog;
-import org.eclipse.wst.common.frameworks.internal.dialog.ui.StatusDialogConstants;
-
-
-/**
- * This is the Eclipse UI version of the IStatusHandler
- */
-public class EclipseStatusHandler implements IStatusHandler
-{
- private Shell shell_;
-
- public EclipseStatusHandler()
- {
- this( new Shell() );
- }
-
- public EclipseStatusHandler(Shell shell)
- {
- shell_ = shell;
- }
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
- */
- public Choice report(IStatus status, Choice[] choices)
- {
- int result =
- MessageDialog.openMessage(
- shell_,
- Messages.TITLE_WARNING,
- null,
- status,
- choices);
- for (int i = 0; i < choices.length; i++)
- {
- if (choices[i].getShortcut() == result)
- return choices[i];
- }
-
- return null;
- }
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
- */
- public void report(IStatus status) throws StatusException
- {
- boolean userOk = false;
-
- switch (status.getSeverity())
- {
- // an error has been reported and we need to stop executing the comming
- // commands
- case Status.ERROR :
- {
- userOk = reportErrorStatus(status);
- break;
- }
- case Status.WARNING :
- {
- userOk = reportWarning(status);
- break;
- }
- case Status.INFO :
- {
- userOk = true;
- reportInfo(status);
- break;
- }
- }
-
- if( !userOk ) throw new StatusException( status );
- }
-
- private boolean reportWarning(IStatus status)
- {
- int userResponse =
- MessageDialog.openMessage(
- shell_,
- Messages.TITLE_WARNING,
- null,
- status);
- return (userResponse == StatusDialogConstants.OK_ID);
- }
-
- private boolean reportErrorStatus(IStatus status)
- {
- MessageDialog.openMessage(
- shell_,
- Messages.TITLE_ERROR,
- null,
- status);
- return false;
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IStatusHandler#reportError(org.eclipse.core.runtime.IStatus)
- */
- public void reportError(IStatus status)
- {
- reportErrorStatus( status );
- }
-
- /**
- * @see org.eclipse.wst.common.environment.IStatusHandler#reportInfo(org.eclipse.core.runtime.IStatus)
- */
- public void reportInfo(IStatus status)
- {
- MessageDialog.openMessage(
- shell_,
- Messages.TITLE_INFO,
- null,
- status);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/Messages.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/Messages.java
deleted file mode 100644
index 04c29ee..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/Messages.java
+++ /dev/null
@@ -1,27 +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.frameworks.internal.eclipse.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.wst.common.frameworks.internal.eclipse.ui.environment"; //$NON-NLS-1$
-
- public static String TITLE_WARNING;
- public static String TITLE_ERROR;
- public static String TITLE_INFO;
-
- static
- {
- NLS.initializeMessages( BUNDLE_NAME, Messages.class );
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties
deleted file mode 100644
index eefde94..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/eclipse/ui/environment.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-
-TITLE_WARNING=Warning:
-TITLE_ERROR=Error:
-TITLE_INFO=Info:
-
-
-
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java
deleted file mode 100644
index 60b55eb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java
+++ /dev/null
@@ -1,28 +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 Jan 16, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface CommonUIPluginConstants {
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks.ui"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardExtensionFactory.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardExtensionFactory.java
deleted file mode 100644
index b9f0cff..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardExtensionFactory.java
+++ /dev/null
@@ -1,44 +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.frameworks.internal.operation.extensionui;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-/**
- * This interface is EXPERIMENTAL and is subject to substantial changes.
- */
-public abstract class DMWizardExtensionFactory {
-
- public DMWizardExtensionFactory() {
- super();
- }
-
- public abstract DataModelWizardPage[] createPageGroup(IDataModel dataModel, String pageGroupID);
-
- /*
- * this is optional
- */
- public IDMPageHandler createPageHandler(IDataModel dataModel, String pageGroupID)
- {
- return null;
- }
-
- /**
- * This page group handler can be optionally overriden.
- */
- public IDMPageGroupHandler createPageGroupHandler( IDataModel dataModel, String pageGroupID )
- {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java
deleted file mode 100644
index 0374f5e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java
+++ /dev/null
@@ -1,270 +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.frameworks.internal.operation.extensionui;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-
-public class DMWizardPageElement extends AbstractRegistryDescriptor implements Comparable {
- static final String ELEMENT_PAGE_GROUP = "wizardPageGroup"; //$NON-NLS-1$
- static final String ATT_PAGE_ID = "pageGroupID"; //$NON-NLS-1$
- static final String ATT_WIZARD_ID = "wizardID"; //$NON-NLS-1$
- static final String ATT_REQUIRES_DATA_OPERATION_ID = "requiresDataOperationId"; //$NON-NLS-1$
- static final String ATT_DATA_MODEL_IDS = "dataModelIds"; //$NON-NLS-1$
- static final String ATT_ALLOWS_EXTENDED_PAGES_AFTER = "allowsExtendedPagesAfter"; //$NON-NLS-1$
- static final String ATT_PAGE_INSERTION_ID = "pageGroupInsertionID"; //$NON-NLS-1$
- static final String ELEMENT_FACTORY = "factory"; //$NON-NLS-1$
-
- protected DMWizardPageFactoryElement wizardPageFactoryElement;
- protected String pluginID;
- protected String wizardID;
- public String pageGroupID;
- protected String wizardFactoryElement;
- protected boolean allowsExtendedPagesAfter;
- protected String requiresDataOperationId;
- protected Set dataModelIDs;
- protected String pageInsertionID;
- private int loadOrder;
- private static int loadOrderCounter;
-
-
- private int type;
-
- public DMWizardPageElement(IConfigurationElement element1) {
- super(element1);
- pluginID = element1.getDeclaringExtension().getNamespace();
- wizardID = element1.getAttribute(ATT_WIZARD_ID);
- pageGroupID = element1.getAttribute(ATT_PAGE_ID);
- requiresDataOperationId = element1.getAttribute(ATT_REQUIRES_DATA_OPERATION_ID);
- dataModelIDs = getDataModelIds( element1 );
- readAllowsExtendedPageAfter(element1);
- pageInsertionID = element1.getAttribute(ATT_PAGE_INSERTION_ID);
- readFactory(element1);
- validateSettings();
- loadOrder = loadOrderCounter++;
- }
-
- private Set getDataModelIds(IConfigurationElement element )
- {
- HashSet ids = new HashSet();
- String idList = element.getAttribute(ATT_DATA_MODEL_IDS);
-
- if( idList != null )
- {
- String[] dataModelIDs = idList.split( " *"); //$NON-NLS-1$
-
- for( int index = 0; index < dataModelIDs.length; index++ )
- {
- ids.add( dataModelIDs[index] );
- }
- }
-
- return ids;
- }
-
- private void validateSettings() {
- if (wizardID == null || wizardPageFactoryElement == null) {
- Logger.getLogger().logError("Incomplete page extension specification."); //$NON-NLS-1$
- }
- }
-
-
- private void readAllowsExtendedPageAfter(IConfigurationElement element1) {
- String allowsPageAfterValue = element1.getAttribute(ATT_ALLOWS_EXTENDED_PAGES_AFTER);
- allowsExtendedPagesAfter = allowsPageAfterValue == null ? false : Boolean.valueOf(allowsPageAfterValue).booleanValue();
- }
-
- private void readFactory(IConfigurationElement element1) {
- IConfigurationElement[] factories = element1.getChildren(ELEMENT_FACTORY);
- if (factories != null && factories.length > 0) {
- wizardPageFactoryElement = new DMWizardPageFactoryElement(factories[0], pageGroupID);
- }
- }
-
- public IDMPageHandler createPageHandler(IDataModel dataModel) {
- if (wizardPageFactoryElement != null)
- return wizardPageFactoryElement.createPageHandler(dataModel);
- return null;
- }
-
- public DataModelWizardPage[] createPageGroup(IDataModel dataModel) {
- if (wizardPageFactoryElement != null)
- return wizardPageFactoryElement.createPageGroup(dataModel);
- return null;
- }
-
- public IDMPageGroupHandler createPageGroupHandler(IDataModel dataModel) {
- return wizardPageFactoryElement == null ? null : wizardPageFactoryElement.createPageGroupHandler(dataModel);
- }
-
- public int compareTo(Object o) {
- return IdentifiableComparator.getInstance().compare(this, o);
- /*
- * if (o == null) return GREATER_THAN; WizardPageElement element = (WizardPageElement) o; if
- * (getID() == null && element.getID() == null) return compareLoadOrder(element); if
- * (getID() == null) return GREATER_THAN; else if (element.getID() == null) return
- * LESS_THAN;
- *
- * int priority = getPriority(); int elementPriority =element.getPriority();
- *
- * if (priority == elementPriority) return compareLoadOrder(element); if (priority <
- * elementPriority) return GREATER_THAN; if (priority > elementPriority) return LESS_THAN;
- * return EQUAL;
- */
- }
-
- /**
- * @return
- */
- public boolean allowsExtendedPagesAfter() {
- return allowsExtendedPagesAfter;
- }
-
- /**
- * @return
- */
- public String getPluginID() {
- return pluginID;
- }
-
- /**
- * @return
- */
- public String getPageID() {
- return pageGroupID;
- }
-
- /**
- * @return
- */
- public String getPageInsertionID() {
- return pageInsertionID;
- }
-
- /**
- * @return
- */
- public int getType() {
- return type;
- }
-
- /**
- * @return
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-
-
- /**
- * @return Returns the allowsExtendedPagesAfter.
- */
- public boolean isAllowsExtendedPagesAfter() {
- return allowsExtendedPagesAfter;
- }
-
- /**
- * @param allowsExtendedPagesAfter
- * The allowsExtendedPagesAfter to set.
- */
- public void setAllowsExtendedPagesAfter(boolean allowsExtendedPagesAfter) {
- this.allowsExtendedPagesAfter = allowsExtendedPagesAfter;
- }
-
- public String getRequiresDataOperationId() {
- return requiresDataOperationId;
- }
-
-
- public void setRequiresDataOperationId(String dataOperationId) {
- requiresDataOperationId = dataOperationId;
- }
-
- public Set getDataModelIDs() {
- return dataModelIDs;
- }
-
- public void setDataModelID(Set newDataModelIDs) {
- dataModelIDs = newDataModelIDs;
- }
-
- /**
- * @return Returns the wizardFactoryElement.
- */
- public String getWizardFactoryElement() {
- return wizardFactoryElement;
- }
-
- /**
- * @param wizardFactoryElement
- * The wizardFactoryElement to set.
- */
- public void setWizardFactoryElement(String wizardFactoryElement) {
- this.wizardFactoryElement = wizardFactoryElement;
- }
-
- /**
- * @return Returns the wizardID.
- */
- public String getWizardID() {
- return wizardID;
- }
-
- /**
- * @param wizardID
- * The wizardID to set.
- */
- public void setWizardID(String wizardID) {
- this.wizardID = wizardID;
- }
-
- /**
- * @return Returns the wizardPageFactoryElement.
- */
- public DMWizardPageFactoryElement getWizardPageFactoryElement() {
- return wizardPageFactoryElement;
- }
-
- /**
- * @param wizardPageFactoryElement
- * The wizardPageFactoryElement to set.
- */
- public void setWizardPageFactoryElement(DMWizardPageFactoryElement wizardPageFactoryElement) {
- this.wizardPageFactoryElement = wizardPageFactoryElement;
- }
-
-
- /**
- * @param pageID
- * The pageID to set.
- */
- public void setPageID(String pageID) {
- this.pageGroupID = pageID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor#getID()
- */
- public String getID() {
- return getPageID();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageExtensionManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageExtensionManager.java
deleted file mode 100644
index 7e2f771..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageExtensionManager.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.frameworks.internal.operation.extensionui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-
-public class DMWizardPageExtensionManager {
-
- public static final String ORG_ECLIPSE_UI = "org.eclipse.ui"; //$NON-NLS-1$
-
- protected static DMWizardPageExtensionManager instance = null;
-
- HashMap wizardPluginIDMap = null;
-
- TreeMap wizardPageElements = null;
-
- // private TreeSet wizardExtPageElements = null;
- List nonSyncedPageElementList = null;
-
- private WizardPageExtensionReader reader = null;
-
- private DMWizardPageExtensionManager() {
- setupWizardPluginIDMap();
- readFromRegistry();
- postReadFromRegistry();
- }
-
- private void setupWizardPluginIDMap() {
- wizardPluginIDMap = new HashMap();
- // get editor plugin and save it to a hash map
- // Note: editors extension id is different from editor id
-
- IExtensionPoint[] point = new IExtensionPoint[]{Platform.getExtensionRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "exportWizards"), //$NON-NLS-1$
- Platform.getExtensionRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "importWizards"), //$NON-NLS-1$
- Platform.getExtensionRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "newWizards"), //$NON-NLS-1$
- Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.wst.common.frameworks.ui", "extendableWizard")}; //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int x = 0; x < point.length; x++) {
- IConfigurationElement[] elements = point[x].getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- String wizardID = elements[i].getAttribute("id"); //$NON-NLS-1$
- String pluginID = elements[i].getDeclaringExtension().getNamespace();
- wizardPluginIDMap.put(wizardID, pluginID);
- }
- }
- }
-
- private void readFromRegistry() {
- wizardPageElements = new TreeMap();
- // wizardExtPageElements = new TreeSet();
- nonSyncedPageElementList = new ArrayList();
- // Read all page extensions into editorPageElements
- reader = new WizardPageExtensionReader();
- reader.readRegistry();
-
- }
-
- protected class WizardPageExtensionReader extends RegistryReader {
-
- public WizardPageExtensionReader() {
- super(CommonUIPluginConstants.PLUGIN_ID, DMWizardPageElement.ELEMENT_PAGE_GROUP);
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!DMWizardPageElement.ELEMENT_PAGE_GROUP.equals(element.getName()))
- return false;
- DMWizardPageElement newElement = new DMWizardPageElement(element);
-
- // put the element into a hashmap, wizardID as key,
- // list of page elements as object
- String wizardID = newElement.getWizardID();
- if (!wizardPageElements.containsKey(wizardID)) {
- wizardPageElements.put(wizardID, createPageMapEntry(newElement));
- } else {
- TreeMap pageMap = (TreeMap) wizardPageElements.get(wizardID);
- insertPageElement(pageMap, newElement);
- }
-
- return true;
- }
-
- public void insertPageElement(TreeMap pageMap, DMWizardPageElement newElement) {
- if (newElement.pageInsertionID == null) {
- pageMap.put(newElement, new TreeSet());
- } else {
- String elementName = newElement.pageInsertionID;
- DMWizardPageElement parentElement = getPageElement(elementName, pageMap);
- insertExtPageElement(pageMap, parentElement, newElement);
- }
-
- newElement.getPageInsertionID();
-
- }
-
- private void insertExtPageElement(TreeMap pageMap, DMWizardPageElement parentElement, DMWizardPageElement newElement) {
- if (parentElement == null) {
- nonSyncedPageElementList.add(newElement);
- return;
- }
- if (!parentElement.allowsExtendedPagesAfter()) {
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WizardPageExtensionManager_UI_0, new Object[]{parentElement.getPageID()}));
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WizardPageExtensionManager_UI_1, new Object[]{newElement.getPageID()}));
- return;
- }
- TreeSet set = (TreeSet) pageMap.get(parentElement);
- set.add(newElement);
-
- if (newElement.allowsExtendedPagesAfter)
- pageMap.put(newElement, new TreeSet());
-
- if (nonSyncedPageElementList.contains(newElement))
- nonSyncedPageElementList.remove(newElement);
- }
-
- private DMWizardPageElement getPageElement(String elementName, TreeMap map) {
- Set keySet = map.keySet();
- for (Iterator iter = keySet.iterator(); iter.hasNext();) {
- DMWizardPageElement element = (DMWizardPageElement) iter.next();
- if (element.getPageID().equals(elementName))
- return element;
- }
- return null;
-
- }
-
- private TreeMap createPageMapEntry(DMWizardPageElement newElement) {
- TreeMap pageMap = new TreeMap();
- TreeSet pageExtensionSet = new TreeSet();
- pageMap.put(newElement, pageExtensionSet);
- return pageMap;
-
- }
-
- }
-
- public boolean hasExtensionElements(String wizardID) {
- TreeMap treeMap = (TreeMap) wizardPageElements.get(wizardID);
- return treeMap.isEmpty();
- }
-
- public DMWizardPageElement[] getPageElements(String wizardID) {
- TreeMap elementMap = (TreeMap) wizardPageElements.get(wizardID);
- if (elementMap == null || elementMap.isEmpty()) {
- return new DMWizardPageElement[0];
- }
- ArrayList alreadyVistedList = new ArrayList(elementMap.size());
- Set allPageElementsList = elementMap.keySet();
- ArrayList orderedPageList = new ArrayList(elementMap.size());
-
- for (Iterator iter = allPageElementsList.iterator(); iter.hasNext();) {
- DMWizardPageElement element = (DMWizardPageElement) iter.next();
- if (alreadyVistedList.contains(element))
- continue;
- if (EnablementManager.INSTANCE.getIdentifier(element.getID(), null).isEnabled()) {
- orderedPageList.add(element);
- TreeSet treeSet = (TreeSet) elementMap.get(element);
- if (treeSet != null && !treeSet.isEmpty())
- flatenTreeSet(treeSet, allPageElementsList, alreadyVistedList, orderedPageList, elementMap);
- }
- }
- return getPageArray(orderedPageList);
-
- }
-
- private DMWizardPageElement[] getPageArray(ArrayList orderedPageList) {
- DMWizardPageElement[] pageElements = new DMWizardPageElement[orderedPageList.size()];
- for (int i = 0; i < orderedPageList.size(); i++) {
- pageElements[i] = (DMWizardPageElement) orderedPageList.get(i);
- }
- return pageElements;
- }
-
- private void flatenTreeSet(TreeSet treeSet, Set allPageElementsList, ArrayList alreadyVistedList, ArrayList orderedPageList, TreeMap elementMap) {
- for (Iterator iter = treeSet.iterator(); iter.hasNext();) {
- DMWizardPageElement element = (DMWizardPageElement) iter.next();
- if (alreadyVistedList.contains(element)) {
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WizardPageExtensionManager_UI_2, new Object[]{element.getPageID(), DMWizardPageElement.ATT_PAGE_INSERTION_ID}));
- return;
- }
- if (allPageElementsList.contains(element)) {
- TreeSet set = (TreeSet) elementMap.get(element);
- orderedPageList.add(element);
- alreadyVistedList.add(element);
- flatenTreeSet(set, allPageElementsList, alreadyVistedList, orderedPageList, elementMap);
- } else {
- orderedPageList.add(element);
- alreadyVistedList.add(element);
- }
-
- }
-
- }
-
- // if child elements are read in before parent element. Do post read.
- protected ArrayList listRemoveObjects;
-
- private void postReadFromRegistry() {
- listRemoveObjects = new ArrayList(nonSyncedPageElementList.size());
- for (int i = 0; i < nonSyncedPageElementList.size(); i++) {
- DMWizardPageElement element = (DMWizardPageElement) nonSyncedPageElementList.get(i);
- TreeMap pageMap = (TreeMap) wizardPageElements.get(element.wizardID);
- if (element.pageInsertionID == null) {
- addToFirstAvialiable(pageMap, element);
- } else if (reader != null && pageMap != null)
- reader.insertPageElement(pageMap, element);
- }
- nonSyncedPageElementList.removeAll(listRemoveObjects);
- if (!nonSyncedPageElementList.isEmpty())
- logMissingClassError();
- nonSyncedPageElementList.clear();
-
- }
-
- /**
- * @param pageMap
- * @param element
- */
- private void addToFirstAvialiable(TreeMap pageMap, DMWizardPageElement newElement) {
- boolean insertNotFound = true;
- for (Iterator iter = pageMap.keySet().iterator(); iter.hasNext();) {
- DMWizardPageElement element = (DMWizardPageElement) iter.next();
- if (element.allowsExtendedPagesAfter) {
- TreeSet set = (TreeSet) pageMap.get(element);
- set.add(newElement);
- listRemoveObjects.add(newElement);
- return;
- }
- }
- if (insertNotFound) {
- Logger logger = Logger.getLogger();
- logger.logError(WTPCommonUIResourceHandler.WizardPageExtensionManager_UI_3);
- }
-
- }
-
- private void logMissingClassError() {
- Logger logger = Logger.getLogger();
- for (int i = 0; i < nonSyncedPageElementList.size(); i++) {
- DMWizardPageElement element = (DMWizardPageElement) nonSyncedPageElementList.get(i);
- logger.logError(WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.WizardPageExtensionManager_UI_4, new Object[]{element.pageInsertionID, element.getPageID(), element.pluginID}));
- }
- nonSyncedPageElementList.clear();
-
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a EjbPageExtensionRegistry
- */
- public static DMWizardPageExtensionManager getInstance() {
- if (instance == null) {
- instance = new DMWizardPageExtensionManager();
- }
- return instance;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageFactoryElement.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageFactoryElement.java
deleted file mode 100644
index 17a766c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageFactoryElement.java
+++ /dev/null
@@ -1,96 +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 Oct 20, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.ConfigurationElementWrapper;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class DMWizardPageFactoryElement extends ConfigurationElementWrapper {
-
- static final String ATT_CLASS_NAME = "className"; //$NON-NLS-1$
-
- protected String className;
- protected DMWizardExtensionFactory wizardPageFactory;
- protected boolean isPageFactoryInitialized;
- protected String pageGroupID;
-
- /**
- * @param element
- */
- public DMWizardPageFactoryElement(IConfigurationElement element, String pageGroupID) {
- super(element);
- className = element.getAttribute(ATT_CLASS_NAME);
- this.pageGroupID = pageGroupID;
- }
-
- public IDMPageHandler createPageHandler(IDataModel dataModel) {
- if (!isPageFactoryInitialized)
- initPageFactory();
- if (wizardPageFactory == null)
- return null;
-
- IDMPageHandler handler = wizardPageFactory.createPageHandler(dataModel, pageGroupID);
- return handler;
- }
-
- public DataModelWizardPage[] createPageGroup(IDataModel dataModel) {
- if (!isPageFactoryInitialized)
- initPageFactory();
-
- if (wizardPageFactory == null)
- return null;
-
- DataModelWizardPage[] pages = wizardPageFactory.createPageGroup(dataModel, pageGroupID);
-
- return pages;
- }
-
- public IDMPageGroupHandler createPageGroupHandler( IDataModel dataModel )
- {
- if (!isPageFactoryInitialized) initPageFactory();
-
- if( wizardPageFactory == null ) return null;
-
- return wizardPageFactory.createPageGroupHandler( dataModel, pageGroupID );
- }
-
- private void initPageFactory() {
- try {
- wizardPageFactory = (DMWizardExtensionFactory) element.createExecutableExtension(ATT_CLASS_NAME);
- } catch (CoreException e) {
- Logger.getLogger().logError("Error getting page factory: " + className); //$NON-NLS-1$
- Logger.getLogger().logError(e);
- } finally {
- isPageFactoryInitialized = true;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DataModelWizardExtensionReader.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DataModelWizardExtensionReader.java
deleted file mode 100644
index 5ce7b73..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DataModelWizardExtensionReader.java
+++ /dev/null
@@ -1,84 +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.frameworks.internal.operation.extensionui;
-
-import java.util.HashMap;
-
-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.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-public class DataModelWizardExtensionReader extends RegistryReader {
-
- private static final String EXTENSION = "DataModelWizardExtension"; //$NON-NLS-1$
- private static final String ELEMENT = "DataModelWizard"; //$NON-NLS-1$
- private static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
- private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
-
- private HashMap extensions;
-
- public DataModelWizardExtensionReader() {
- super(WTPUIPlugin.PLUGIN_ID, EXTENSION);
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT))
- return false;
- String id = element.getAttribute(ATTRIBUTE_ID);
- if (null == id || id.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + ELEMENT + " is missing " + ATTRIBUTE_ID)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- String className = element.getAttribute(ATTRIBUTE_CLASS);
- if (null == className || className.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + ELEMENT + " is missing " + ATTRIBUTE_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- addExtension(id, element);
- return true;
- }
-
- private void addExtension(String id, IConfigurationElement element) {
- if (extensions.containsKey(id)) {
- Logger.getLogger().logError(new RuntimeException("Duplicate " + ELEMENT + " " + ATTRIBUTE_ID + " " + id)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- extensions.put(id, element);
- }
-
- protected IConfigurationElement getExtension(String id) {
- if (extensions == null) {
- extensions = new HashMap();
- readRegistry();
- }
- IConfigurationElement element = (IConfigurationElement) extensions.get(id);
- if (null == element) {
- throw new RuntimeException("Extension:" + EXTENSION + " Element:" + ELEMENT + " not found for " + ATTRIBUTE_ID + ": " + id); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- return element;
- }
-
- public DataModelWizard getWizard(IDataModel dataModel) {
- DataModelWizard wizard = null;
- IConfigurationElement element = getExtension(dataModel.getID());
-
- try {
- wizard = (DataModelWizard) element.createExecutableExtension(ATTRIBUTE_CLASS);
- wizard.setDataModel(dataModel);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return wizard;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java
deleted file mode 100644
index c6aee2c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java
+++ /dev/null
@@ -1,177 +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.frameworks.internal.operation.extensionui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-
-/**
- * @author mdelder
- */
-public class ExtensibleViewRegistry extends RegistryReader {
-
- private static ExtensibleViewRegistry INSTANCE = null;
- private Map extendedViewerMap = null;
- private Map descriptorMap = null;
-
- protected interface Elements {
- public static final String EXTENDED_VIEWER = "extendedViewer"; //$NON-NLS-1$
- public static final String VIEWER_ID = "viewerID"; //$NON-NLS-1$
- public static final String PARENT_VIEWER_ID = "parentViewerID"; //$NON-NLS-1$
- public static final String FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
- public static final String ICON = "icon"; //$NON-NLS-1$
- public static final String LABEL = "label"; //$NON-NLS-1$
- public static final String FUNCTION_GROUP_ID = "functionGroupID"; //$NON-NLS-1$
- }
-
- /**
- *
- */
- private ExtensibleViewRegistry() {
- super(WTPUIPlugin.PLUGIN_ID, WTPUIPlugin.EXTENDED_VIEWER_REGISTRY_EXTENSION_POINT);
- }
-
- public static ExtensibleViewRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ExtensibleViewRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- public Descriptor getDescriptor(String viewerID) {
- return (Descriptor) getDescriptorMap().get(viewerID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals(Elements.EXTENDED_VIEWER)) {
- Descriptor descriptor = new Descriptor(element);
- getDescriptorMap().put(descriptor.getViewerID(), descriptor);
- return true;
- }
- return false;
- }
-
- /**
- * @return Returns the extendedViewerMap.
- */
- protected Map getExtendedViewerMap() {
- if (extendedViewerMap == null)
- extendedViewerMap = new HashMap();
- return extendedViewerMap;
- }
-
- /**
- * @return Returns the descriptorMap.
- */
- protected Map getDescriptorMap() {
- if (descriptorMap == null)
- descriptorMap = new HashMap();
- return descriptorMap;
- }
-
- public class Descriptor {
-
- private String viewerID = null;
- private String parentViewerID = null;
- private String factoryClass = null;
- private String icon = null;
- private String label = null;
- private String functionGroupID = null;
-
- private String toStringCache = null;
- private IConfigurationElement element = null;
-
- /**
- *
- */
- public Descriptor(IConfigurationElement element) {
- this.element = element;
-
- this.viewerID = this.element.getAttribute(ExtensibleViewRegistry.Elements.VIEWER_ID);
- this.parentViewerID = this.element.getAttribute(ExtensibleViewRegistry.Elements.PARENT_VIEWER_ID);
- this.factoryClass = this.element.getAttribute(ExtensibleViewRegistry.Elements.FACTORY_CLASS);
- this.icon = this.element.getAttribute(ExtensibleViewRegistry.Elements.ICON);
- this.label = this.element.getAttribute(ExtensibleViewRegistry.Elements.LABEL);
- this.functionGroupID = this.element.getAttribute(ExtensibleViewRegistry.Elements.FUNCTION_GROUP_ID);
- }
-
- public IExtensibleViewFactory createFactoryInstance() {
- IExtensibleViewFactory factoryInstance = null;
- try {
- factoryInstance = (IExtensibleViewFactory) this.element.createExecutableExtension(getFactoryClass());
- } catch (CoreException e) {
- WTPUIPlugin.getLogger().logError(e);
- }
- return factoryInstance;
- }
-
- /**
- * @return Returns the factoryClass.
- */
- public String getFactoryClass() {
- return factoryClass;
- }
-
- /**
- * @return Returns the functionGroupID.
- */
- public String getFunctionGroupID() {
- return functionGroupID;
- }
-
- /**
- * @return Returns the icon.
- */
- public String getIcon() {
- return icon;
- }
-
- /**
- * @return Returns the label.
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @return Returns the parentViewerID.
- */
- public String getParentViewerID() {
- return parentViewerID;
- }
-
- /**
- * @return Returns the viewerID.
- */
- public String getViewerID() {
- return viewerID;
- }
-
- public String toString() {
- if (toStringCache == null)
- toStringCache = "ExtensibleViewRegistry.Info [viewerID=\"" + getViewerID() + "\",parentViewerID=\"" + getParentViewerID() + "\",factoryClass=" + getFactoryClass() + "\",functionGroupID=\"" + getFunctionGroupID() + "\"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return toStringCache;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java
deleted file mode 100644
index 261938b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java
+++ /dev/null
@@ -1,21 +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.common.frameworks.internal.operation.extensionui;
-
-/**
- * @author mdelder
- */
-public interface IExtensibleViewFactory {
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.java
deleted file mode 100644
index 747b5ca..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.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
- *******************************************************************************/
-/*
- * Created on May 5, 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.frameworks.internal.operation.extensionui;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public interface IOperationNode {
-
- public IOperationNode[] getChildren();
-
- public boolean isChecked();
-
- /**
- * Same as calling setChecked(checked, true)
- *
- * @param checked
- */
- public void setChecked(boolean checked);
-
- public String getName();
-
- public String getDescription();
-
- public IOperationNode getParent();
-
- /**
- * @return
- */
- public boolean isAlwaysExecute();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java
deleted file mode 100644
index 583f298..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java
+++ /dev/null
@@ -1,66 +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 10, 2003
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.DefaultPluginTraceRenderer;
-import org.eclipse.jem.util.logger.proxyrender.IMsgLogger;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public abstract class AbstractWTPUIPlugin extends AbstractUIPlugin implements IMsgLogger {
- protected static Logger logger = null;
- public ResourceBundle resourceBundle;
- protected static AbstractWTPUIPlugin instance = null;
-
- /**
- * @param descriptor
- */
- public AbstractWTPUIPlugin() {
- super();
- instance = this;
- }
-
- public Logger getMsgLogger() {
- if (logger == null) {
- logger = Logger.getLogger(getPluginID());
- setRenderer(logger);
- }
- return logger;
- }
-
- public abstract String getPluginID();
-
- /**
- * @param aLogger
- */
- protected void setRenderer(Logger aLogger) {
- new DefaultPluginTraceRenderer(aLogger);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java
deleted file mode 100644
index 7316c8b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 24, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ClosableWizardDialog extends WizardDialog {
- /**
- * @param parentShell
- * @param newWizard
- */
- public ClosableWizardDialog(Shell parentShell, IWizard newWizard) {
- super(parentShell, newWizard);
- }
-
- public void finishAndClose() {
- super.finishPressed();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DMPageGroupElementImpl.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DMPageGroupElementImpl.java
deleted file mode 100644
index 22caa6d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DMPageGroupElementImpl.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.wst.common.frameworks.internal.ui;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.DMWizardPageElement;
-
-public class DMPageGroupElementImpl implements IDMPageGroup {
- private DMWizardPageElement pageElement;
-
- public DMPageGroupElementImpl(IConfigurationElement element) {
- pageElement = new DMWizardPageElement(element);
- }
-
- public boolean getAllowsExtendedPages() {
- return pageElement.allowsExtendedPagesAfter();
- }
-
- public String getRequiredDataOperationToRun() {
- return pageElement.getRequiresDataOperationId();
- }
-
- public Set getDataModelIDs() {
- return pageElement.getDataModelIDs();
- }
-
- public IDMPageGroupHandler getPageGroupHandler(IDataModel dataModel) {
- return pageElement.createPageGroupHandler(dataModel);
- }
-
- public List getPages(IDataModel dataModel){
- return Arrays.asList(pageElement.createPageGroup(dataModel));
- }
-
- public IDMPageHandler getPageHandler(IDataModel dataModel) {
- return pageElement.createPageHandler(dataModel);
- }
-
- public String getPageGroupID() {
- return pageElement.getPageID();
- }
-
- public String getPageGroupInsertionID() {
- return pageElement.getPageInsertionID();
- }
-
- public String getWizardID() {
- return pageElement.getWizardID();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java
deleted file mode 100644
index 647f58e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 19, 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.frameworks.internal.ui;
-
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author mdelder
- */
-public class DisplayUtility {
-
- public static void asyncExec(Runnable runnable) {
-
- Display d = Display.getCurrent();
- if (d == null)
- Display.getDefault().asyncExec(runnable);
- else
- runnable.run();
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java
deleted file mode 100644
index 6c24426..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java
+++ /dev/null
@@ -1,191 +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.frameworks.internal.ui;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Added a Details button to the MessageDialog to show the exception stack trace.
- *
- * Borrowed from an eclipse InternalErrorDialog
- */
-public class ErrorDialog extends MessageDialog {
- protected static final String[] LABELS_OK = {IDialogConstants.OK_LABEL};
- protected static final String[] LABELS_OK_CANCEL = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL};
- protected static final String[] LABELS_OK_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- protected static final String[] LABELS_OK_CANCEL_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- private Throwable detail;
- private int detailButtonID = -1;
- private Text text;
- private String message;
- //Workaround. SWT does not seem to set the default button if
- //there is not control with focus. Bug: 14668
- private int defaultButtonIndex = 0;
- /**
- * Size of the text in lines.
- */
- private static final int TEXT_LINE_COUNT = 15;
-
- public ErrorDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, Throwable detail, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- defaultButtonIndex = defaultIndex;
- this.detail = detail;
- message = dialogMessage;
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- //Workaround. SWT does not seem to set rigth the default button if
- //there is not control with focus. Bug: 14668
- public int open() {
- create();
- Button b = getButton(defaultButtonIndex);
- b.setFocus();
- b.getShell().setDefaultButton(b);
- return super.open();
- }
-
- /**
- * Set the detail button;
- */
- public void setDetailButton(int index) {
- detailButtonID = index;
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == detailButtonID) {
- toggleDetailsArea();
- } else {
- setReturnCode(buttonId);
- close();
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- if (text != null) {
- text.dispose();
- text = null;
- getButton(detailButtonID).setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownText((Composite) getContents());
- getButton(detailButtonID).setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
- Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- /**
- * Create this dialog's drop-down list component.
- *
- * @param parent
- * the parent composite
- * @return the drop-down list component
- */
- protected void createDropDownText(Composite parent) {
- // create the list
- text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- // print the stacktrace in the text field
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(baos);
- detail.printStackTrace(ps);
- if ((detail instanceof SWTError) && (((SWTError) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTError) detail).throwable.printStackTrace(ps);
- } else if ((detail instanceof SWTException) && (((SWTException) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTException) detail).throwable.printStackTrace(ps);
- }
- ps.flush();
- baos.flush();
- text.setText(baos.toString());
- } catch (IOException e) {
- }
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.heightHint = text.getLineHeight() * TEXT_LINE_COUNT;
- text.setLayoutData(data);
- }
-
- public static boolean openError(Shell parent, String title, String message, Throwable detail, int defaultIndex, boolean showCancel) {
- String[] labels;
- if (detail == null)
- labels = showCancel ? LABELS_OK_CANCEL : LABELS_OK;
- else
- labels = showCancel ? LABELS_OK_CANCEL_DETAILS : LABELS_OK_DETAILS;
- ErrorDialog dialog = new ErrorDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, detail, ERROR, labels, defaultIndex);
- if (detail != null)
- dialog.setDetailButton(labels.length - 1);
- return dialog.open() == 0;
- }
-
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- ((GridLayout) composite.getLayout()).numColumns = 2;
- // create image
- Image image = composite.getDisplay().getSystemImage(SWT.ICON_ERROR);
- if (image != null) {
- Label label = new Label(composite, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING));
- }
- // create message
- if (message != null) {
- Label label = new Label(composite, SWT.WRAP);
- label.setText(message);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- }
- return composite;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
deleted file mode 100644
index 2cc778a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ExecutionListener.java
+++ /dev/null
@@ -1,18 +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.frameworks.internal.ui;
-
-import org.eclipse.core.runtime.IStatus;
-
-public interface ExecutionListener
-{
- public IStatus execute();
-
- public void undoExecute();
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java
deleted file mode 100644
index 60769c2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @version 1.0
- * @author
- */
-public abstract class GenericWizardNode implements IWizardNode {
-
- protected IWizard wizard;
-
- /**
- * Constructor for GenericWizardNode.
- */
- public GenericWizardNode() {
- super();
- }
-
- /*
- * @see IWizardNode#dispose()
- */
- public void dispose() {
- if (wizard != null)
- wizard.dispose();
- }
-
- /*
- * @see IWizardNode#getContents()
- */
- public Point getContents() {
- return null;
- }
-
- public final IWizard getWizard() {
- if (wizard == null)
- wizard = createWizard();
- return wizard;
- }
-
- /**
- * Subclasses must override to create the wizard
- */
- protected abstract IWizard createWizard();
-
- /*
- * @see IWizardNode#isContentCreated()
- */
- public boolean isContentCreated() {
- return wizard != null;
- }
-
- /**
- * @see org.eclipse.jface.wizard.IWizardNode#getExtent()
- */
- public Point getExtent() {
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
deleted file mode 100644
index 99fb6f8..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/InternalCommonWorkbenchMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class InternalCommonWorkbenchMessages extends NLS {
- private static final String BUNDLE_NAME = "messages";//$NON-NLS-1$
-
-
- public static String WizardNewProjectCreationPage_projectContentsLabel;
- public static String WizardNewProjectCreationPage_useDefaultLabel;
- public static String WizardNewProjectCreationPage_locationLabel;
-
-
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, InternalCommonWorkbenchMessages.class);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java
deleted file mode 100644
index aed38af..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java
+++ /dev/null
@@ -1,217 +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 Aug 5, 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.frameworks.internal.ui;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-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.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author dfholt
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class ListMessageDialog extends MessageDialog {
- protected String[] listItems;
- protected List list;
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- /**
- * ListMessageDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] names) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- listItems = names;
- }
-
- /**
- * Creates and returns the contents of an area of the dialog which appears below the message and
- * above the button bar.
- * <p>
- * The default implementation of this framework method returns <code>null</code>. Subclasses
- * may override.
- * </p>
- *
- * @param the
- * parent composite to contain the custom area
- * @return the custom area control, or <code>null</code>
- */
- protected Control createCustomArea(Composite parent) {
-
- Composite composite = new Composite(parent, 0);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- if (listItems != null) {
- list = new List(composite, SWT.BORDER);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- list.setLayoutData(data);
- list.setItems(listItems);
- }
-
- return composite;
-
- }
-
- /**
- * Convenience method to open a simple confirm (OK/Cancel) dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openConfirm(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0, items); // OK
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard error dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openError(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is the
- // default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a standard information dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openInformation(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, INFORMATION, new String[]{IDialogConstants.OK_LABEL}, 0, items);
- // ok is the default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openQuestion(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, items); // yes
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard warning dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openWarning(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, WARNING, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is
- // the
- // default
- dialog.open();
- return;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java
deleted file mode 100644
index db72ea5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java
+++ /dev/null
@@ -1,81 +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.common.frameworks.internal.ui;
-
-import java.awt.event.ActionListener;
-
-public class ListenerList {
- private final static ActionListener[] NULL_ARRAY = new ActionListener[0];
- protected transient ActionListener[] listenerList = NULL_ARRAY;
-
- /**
- * Add the listener as a listener of the specified type.
- *
- * @param t
- * the type of the listener to be added
- * @param l
- * the listener to be added
- */
- public synchronized void add(ActionListener l) {
- if (l == null)
- return;
- if (listenerList == NULL_ARRAY) {
- // if this is the first listener added,
- // initialize the lists
- listenerList = new ActionListener[]{l};
- } else {
- // Otherwise copy the array and add the new listener
- int i = listenerList.length;
- ActionListener[] tmp = new ActionListener[i + 1];
- System.arraycopy(listenerList, 0, tmp, 0, i);
-
- tmp[i + 1] = l;
-
- listenerList = tmp;
- }
- }
-
- /**
- * Return the total number of listeners for this listenerlist
- */
- public int getListenerCount() {
- return listenerList.length;
- }
-
- public ActionListener[] getListenerList() {
- return listenerList;
- }
-
- public synchronized void remove(ActionListener l) {
- if (l == null)
- return;
- int index = -1;
- for (int i = listenerList.length - 1; i >= 0; i -= 1) {
- if (listenerList[i].equals(l)) {
- index = i;
- break;
- }
- }
- if (index != -1) {
- ActionListener[] tmp = new ActionListener[listenerList.length - 1];
- // Copy the list up to index
- System.arraycopy(listenerList, 0, tmp, 0, index);
- // Copy from two past the index, up to
- // the end of tmp (which is two elements
- // shorter than the old list)
- if (index < tmp.length)
- System.arraycopy(listenerList, index + 1, tmp, index, tmp.length - index);
- // set the listener array to the new array or null
- listenerList = (tmp.length == 0) ? NULL_ARRAY : tmp;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java
deleted file mode 100644
index 6bb33f6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java
+++ /dev/null
@@ -1,214 +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.frameworks.internal.ui;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-
-public class NewProjectGroup implements IProjectCreationPropertiesNew {
- private IDataModel model;
- public Text projectNameField = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- // default values
- private String defProjectNameLabel = WTPCommonUIResourceHandler.Name_;
- private String defBrowseButtonLabel = WTPCommonUIResourceHandler.Browse_;
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- private DataModelSynchHelper synchHelper;
-
- public NewProjectGroup(Composite parent, IDataModel model) {
- this.model = model;
- synchHelper = new DataModelSynchHelper(model);
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- projectNameField.setFocus();
- }
-
- private final void createProjectNameGroup(Composite parent) {
- Font font = parent.getFont();
- // project specification group
- Composite projectGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- projectGroup.setLayout(layout);
- projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // new project label
- Label projectLabel = new Label(projectGroup, SWT.NONE);
- projectLabel.setFont(font);
- projectLabel.setText(defProjectNameLabel);
-
- // new project name entry field
- projectNameField = new Text(projectGroup, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameField.setLayoutData(data);
- projectNameField.setFont(font);
- synchHelper.synchText(projectNameField, PROJECT_NAME, new Control[]{projectLabel});
- }
-
- /**
- * Creates the project location specification controls.
- *
- * @param parent
- * the parent composite
- */
- private final void createProjectLocationGroup(Composite parent) {
-
- Font font = parent.getFont();
- // project specification group
- Group projectGroup = new Group(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- projectGroup.setLayout(layout);
- projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- projectGroup.setFont(font);
- projectGroup.setText(InternalCommonWorkbenchMessages.WizardNewProjectCreationPage_projectContentsLabel);
-
- final Button useDefaultsButton = new Button(projectGroup, SWT.CHECK | SWT.RIGHT);
- useDefaultsButton.setText(InternalCommonWorkbenchMessages.WizardNewProjectCreationPage_useDefaultLabel);
- useDefaultsButton.setFont(font);
- synchHelper.synchCheckbox(useDefaultsButton, USE_DEFAULT_LOCATION, null);
-
- GridData buttonData = new GridData();
- buttonData.horizontalSpan = 3;
- useDefaultsButton.setLayoutData(buttonData);
-
- createUserSpecifiedProjectLocationGroup(projectGroup);
- }
-
- private void createUserSpecifiedProjectLocationGroup(Composite projectGroup) {
- Font font = projectGroup.getFont();
- // location label
- final Label locationLabel = new Label(projectGroup, SWT.NONE);
- locationLabel.setFont(font);
- locationLabel.setText(InternalCommonWorkbenchMessages.WizardNewProjectCreationPage_locationLabel);
-
- // project location entry field
- locationPathField = new Text(projectGroup, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- locationPathField.setFont(font);
-
- // browse button
- browseButton = new Button(projectGroup, SWT.PUSH);
- browseButton.setFont(font);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- handleLocationBrowseButtonPressed();
- }
- });
-
- final IDataModel localModel = model;
-
- class LocationListener implements ModifyListener, IDataModelListener {
- private boolean typing = false;
-
- public void modifyText(ModifyEvent e) {
- if (!localModel.getBooleanProperty(USE_DEFAULT_LOCATION)) {
- try {
- typing = true;
- localModel.setProperty(USER_DEFINED_LOCATION, locationPathField.getText());
- } finally {
- typing = false;
- }
- }
- }
-
- public void propertyChanged(DataModelEvent event) {
- boolean useDefault = localModel.getBooleanProperty(USE_DEFAULT_LOCATION);
- if (USE_DEFAULT_LOCATION.equals(event.getPropertyName())) {
- locationLabel.setEnabled(!useDefault);
- locationPathField.setEnabled(!useDefault);
- browseButton.setEnabled(!useDefault);
- if (useDefault) {
- locationPathField.setText(localModel.getStringProperty(DEFAULT_LOCATION));
- } else {
- locationPathField.setText(localModel.getStringProperty(USER_DEFINED_LOCATION));
- }
- } else if (!typing) {
- if ((useDefault && DEFAULT_LOCATION.equals(event.getPropertyName())) || (!useDefault && USER_DEFINED_LOCATION.equals(event.getPropertyName()))) {
- locationPathField.setText((String) event.getProperty());
- }
- }
- }
- }
-
- LocationListener listener = new LocationListener();
-
- listener.propertyChanged(new DataModelEvent(model, USE_DEFAULT_LOCATION, IDataModel.VALUE_CHG));
-
- locationPathField.addModifyListener(listener);
- model.addListener(listener);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = model.getStringProperty(USER_DEFINED_LOCATION);
- if (dirName.trim().length() == 0) {
- dirName = new Path(model.getStringProperty(DEFAULT_LOCATION)).removeLastSegments(1).toOSString();
- }
-
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- model.setProperty(USER_DEFINED_LOCATION, selectedDirectory);
- }
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- synchHelper.dispose();
- model = null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java
deleted file mode 100644
index 8ff7b0a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java
+++ /dev/null
@@ -1,121 +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.frameworks.internal.ui;
-
-
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-public class OverlayIcon extends org.eclipse.jface.resource.CompositeImageDescriptor {
- // //$NON-NLS-1$
- static final int DEFAULT_WIDTH = 16;
- static final int DEFAULT_HEIGHT = 16;
- private Point fSize = null;
- private ImageDescriptor fBase;
- private ImageDescriptor fOverlays[][];
-
- public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {
- fBase = base;
- if (fBase == null)
- fBase = ImageDescriptor.getMissingImageDescriptor();
- fOverlays = overlays;
- fSize = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
- }
-
- public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {
- fBase = base;
- if (fBase == null)
- fBase = ImageDescriptor.getMissingImageDescriptor();
- fOverlays = overlays;
- fSize = size;
- }
-
- protected void drawBottomLeft(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = 0;
- for (int i = 0; i < 3; i++) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- drawImage(id, x, getSize().y - id.height);
- x += id.width;
- }
- }
- }
-
- protected void drawBottomRight(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = getSize().x;
- for (int i = 2; i >= 0; i--) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- x -= id.width;
- drawImage(id, x, getSize().y - id.height);
- }
- }
- }
-
- protected void drawCompositeImage(int width, int height) {
- ImageData bg = fBase.getImageData();
- drawImage(bg, 0, 0);
-
- if (fOverlays != null) {
- if (fOverlays.length > 0)
- drawTopRight(fOverlays[0]);
-
- if (fOverlays.length > 1)
- drawBottomRight(fOverlays[1]);
-
- if (fOverlays.length > 2)
- drawBottomLeft(fOverlays[2]);
-
- if (fOverlays.length > 3)
- drawTopLeft(fOverlays[3]);
- }
- }
-
- protected void drawTopLeft(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = 0;
- for (int i = 0; i < 3; i++) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- drawImage(id, x, 0);
- x += id.width;
- }
- }
- }
-
- protected void drawTopRight(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = getSize().x;
- for (int i = 2; i >= 0; i--) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- x -= id.width;
- drawImage(id, x, 0);
- }
- }
- }
-
- protected Point getSize() {
- return fSize;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java
deleted file mode 100644
index 14dde7a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java
+++ /dev/null
@@ -1,563 +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.frameworks.internal.ui;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.IDataModelPausibleOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.IDataModelPausibleOperationEvent;
-import org.eclipse.wst.common.frameworks.internal.datamodel.IDataModelPausibleOperationListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.CommonUIPluginConstants;
-
-public class PageGroupManager {
- private IDataModelPausibleOperation rootOperation;
- private IDMPageGroup rootPageGroup;
- private HashMap groupTable;
- private HashSet operationsRun;
- private Stack pageGroupStack;
- private IDataModel dataModel;
- private StackEntry savedTopEntry;
- private int savedStackSize;
-
- private IConfigurationElement[] elements;
-
- private final String ELEMENT_PAGE_GROUP = "wizardPageGroup"; //$NON-NLS-1$
-
- private String pauseAfterExecution = null;
-
- public PageGroupManager(IDataModel dataModel, IDMPageGroup rootPageGroup) {
-
- this.dataModel = dataModel;
- this.groupTable = new HashMap();
- this.pageGroupStack = new Stack();
- this.rootPageGroup = rootPageGroup;
-
-
- PageGroupEntry rootPageGroupEntry = new PageGroupEntry(rootPageGroup);
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(CommonUIPluginConstants.PLUGIN_ID, ELEMENT_PAGE_GROUP);
- elements = point.getConfigurationElements();
- groupTable.put(this.rootPageGroup.getPageGroupID(), rootPageGroupEntry);
-
- if (this.rootPageGroup.getAllowsExtendedPages()) {
- // Find all the page groups that follow this root page group.
- loadExtendedPages(rootPageGroup);
- }
- }
-
- public PageGroupManager(IDataModelPausibleOperation rootOperation, IDMPageGroup rootPageGroup) {
- this(rootOperation.getDataModel(), rootPageGroup);
- this.operationsRun = new HashSet();
-
- rootOperation.addOperationListener(new IDataModelPausibleOperationListener() {
- public int notify(IDataModelPausibleOperationEvent event) {
- switch (event.getExecutionType()) {
- case IDataModelPausibleOperationEvent.ROLLBACK :
- if (event.getOperationType() == IDataModelPausibleOperationEvent.MAIN_FINISHED) {
- operationsRun.remove(event.getOperation().getID());
- }
- break;
- case IDataModelPausibleOperationEvent.EXECUTE :
- if (event.getOperationType() == IDataModelPausibleOperationEvent.MAIN_FINISHED) {
- operationsRun.add(event.getOperation().getID());
- if (null != pauseAfterExecution && event.getOperation().getID().equals(pauseAfterExecution)) {
- return IDataModelPausibleOperationListener.PAUSE;
- }
- }
- break;
- }
- return IDataModelPausibleOperationListener.CONTINUE;
- }
- });
- }
-
- public void addGroupAfter(String pageGroupID, IDMPageGroup pageInsertGroup) {
- PageGroupEntry pageGroupEntry = (PageGroupEntry) groupTable.get(pageGroupID);
-
- if (pageGroupEntry.pageGroup.getAllowsExtendedPages()) {
- addPageGroup(pageGroupEntry.pageGroup, pageInsertGroup);
- }
- }
-
- public void moveForwardOnePage() {
- boolean pageFound = false;
-
- if (pageGroupStack.empty()) {
- PageGroupEntry rootEntry = (PageGroupEntry) groupTable.get(rootPageGroup.getPageGroupID());
- pageGroupStack.push(new StackEntry(rootEntry, -1));
- }
-
- saveStackInfo();
-
- try {
- pageFound = findNextPage(true);
- } catch (Exception exc) {
- Logger.getLogger().logError(exc);
- if (rootOperation != null) {
- try {
- rootOperation.rollBack(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- pageFound = false;
- }
-
- if (pageFound == false) {
- // If we moved forward and there wasn't a page then we will restore the stack.
- // Normally, this wouldn't happen since a call to hasNextPage would have indicated
- // that there wasn't a page.
- restoreStackInfo();
- }
- }
-
- public void moveBackOnePage() {
- if (pageGroupStack.empty())
- return;
-
- StackEntry topEntry = (StackEntry) pageGroupStack.peek();
-
- // Pop the last page.
- if (!topEntry.pagesReturned.empty())
- topEntry.pagesReturned.pop();
-
- // Now find the previous page.
- boolean foundPreviousPage = findPreviousPageInGroup();
-
- while (!foundPreviousPage && !pageGroupStack.empty()) {
- if (rootOperation != null) {
- if (topEntry.ranOperations) {
- try {
- rootOperation.rollBack(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- pageGroupStack.pop();
-
- if (!pageGroupStack.empty()) {
- foundPreviousPage = findPreviousPageInGroup();
- topEntry = (StackEntry) pageGroupStack.peek();
- }
- }
- }
-
- public void reset() {
- pageGroupStack.clear();
- }
-
- public IWizardPage getCurrentPage() {
- IWizardPage page = null;
-
- if (!pageGroupStack.empty()) {
- StackEntry topEntry = (StackEntry) pageGroupStack.peek();
- int pageIndex = topEntry.getTopPageIndex();
-
- page = pageIndex == -1 ? null : (IWizardPage) topEntry.pageGroupEntry.getPages().get(pageIndex);
- }
-
- return page;
- }
-
- private Boolean hasMulitplePages;
-
- public boolean hasMultiplePages() {
- if (null == hasMulitplePages) {
- int pageCount = 0;
- PageGroupEntry rootEntry = (PageGroupEntry) groupTable.get(rootPageGroup.getPageGroupID());
- pageCount += rootEntry.getPages().size();
- for (int i = 0; pageCount < 2 && i < rootEntry.groupsThatFollow.size(); i++) {
- pageCount += ((PageGroupEntry) rootEntry.groupsThatFollow.get(i)).getPages().size();
- }
- hasMulitplePages = pageCount > 1 ? Boolean.TRUE : Boolean.FALSE;
- }
- return hasMulitplePages.booleanValue();
- }
-
- public boolean hasNextPage() {
- boolean pageFound = false;
-
- saveStackInfo();
-
- if (pageGroupStack.empty()) {
- PageGroupEntry rootEntry = (PageGroupEntry) groupTable.get(rootPageGroup.getPageGroupID());
- pageGroupStack.push(new StackEntry(rootEntry, -1));
- }
-
- pageFound = findNextPage(false);
- restoreStackInfo();
-
- return pageFound;
- }
-
- public void undoAllCurrentOperations() {
- while (!pageGroupStack.empty()) {
- moveBackOnePage();
- }
- }
-
- private boolean findPreviousPageInGroup() {
- StackEntry topEntry = (StackEntry) pageGroupStack.peek();
- boolean pageFound = false;
-
- if (!topEntry.pagesReturned.empty()) {
- topEntry.pagesComplete = false;
- pageFound = true;
- }
-
- return pageFound;
- }
-
- private boolean findNextPage(boolean runOperations) {
- StackEntry topEntry = (StackEntry) pageGroupStack.peek();
- int newPageIndex = topEntry.findNextPageIndex();
- boolean pageFound = false;
-
- if (newPageIndex == -1) {
- // Our page handler didn't find a page so we will see if there is a page group that
- // follows this page group that can find a page.
- topEntry.pagesComplete = true;
-
- StackEntry nextStackEntry = findNextPageGroup(pageGroupStack);
-
- if (nextStackEntry != null) {
- IDMPageGroup pageGroup = nextStackEntry.pageGroupEntry.pageGroup;
- String requiresOperationsId = pageGroup.getRequiredDataOperationToRun();
-
- // If this group requires an operation and it has not already been run
- // then we need to run it.
- if (rootOperation != null && runOperations && requiresOperationsId != null && !operationsRun.contains(requiresOperationsId)) {
- pauseAfterExecution = requiresOperationsId;
- IStatus status = null;
- try {
- status = rootOperation.resume(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
- nextStackEntry.ranOperations = true;
-
- if (status.getSeverity() == IStatus.ERROR) {
- // TODO need a better error feedback mechanism here.
- throw new IllegalArgumentException(status.getMessage());
- }
- }
-
- pageGroupStack.push(nextStackEntry);
- pageFound = findNextPage(runOperations);
- }
- } else {
- // We found a new page in the page handler.
- pageFound = true;
- topEntry.pagesReturned.push(new Integer(newPageIndex));
- }
-
- return pageFound;
- }
-
- private void saveStackInfo() {
- if (!pageGroupStack.empty()) {
- savedTopEntry = new StackEntry((StackEntry) pageGroupStack.peek());
- }
- savedStackSize = pageGroupStack.size();
- }
-
- private void restoreStackInfo() {
- if (savedStackSize == 0) {
- pageGroupStack.removeAllElements();
- } else {
- pageGroupStack.setSize(savedStackSize - 1);
- pageGroupStack.push(savedTopEntry);
- }
- }
-
- private void loadExtendedPages(IDMPageGroup pageGroup) {
- String wizardId = rootPageGroup.getWizardID();
- String pageGroupId = pageGroup.getPageGroupID();
- int length = elements.length;
-
- for (int index = 0; index < length; index++) {
- DMPageGroupElementImpl pageInsertGroup = new DMPageGroupElementImpl(elements[index]);
- String pageInsertGroupId = pageInsertGroup.getPageGroupInsertionID();
- if (pageInsertGroup.getWizardID().equals(wizardId) && (null == pageInsertGroupId || pageInsertGroupId.equals(pageGroupId))) {
- addPageGroup(pageGroup, pageInsertGroup);
-
- // If this page group has page then add them
- if (pageInsertGroup.getAllowsExtendedPages()) {
- loadExtendedPages(pageInsertGroup);
- }
- }
- }
- }
-
- private void addPageGroup(IDMPageGroup pageGroup, IDMPageGroup insertedPageGroup) {
- PageGroupEntry pageGroupEntry = (PageGroupEntry) groupTable.get(pageGroup.getPageGroupID());
- PageGroupEntry nextGroupEntry = (PageGroupEntry) groupTable.get(insertedPageGroup.getPageGroupID());
-
- if (pageGroupEntry == null) {
- pageGroupEntry = new PageGroupEntry(pageGroup);
- groupTable.put(pageGroup.getPageGroupID(), pageGroupEntry);
- }
-
- if (nextGroupEntry == null) {
- nextGroupEntry = new PageGroupEntry(insertedPageGroup);
- groupTable.put(insertedPageGroup.getPageGroupID(), nextGroupEntry);
- }
-
- pageGroupEntry.groupsThatFollow.add(nextGroupEntry);
- }
-
- public StackEntry findNextPageGroup(Stack stack) {
- StackEntry topEntry = (StackEntry) stack.peek();
- PageGroupEntry nextPageGroup = topEntry.getNextPageGroup(null);
- int parentIndex = topEntry.parentGroupIndex;
- int prevParentIndex = stack.size() - 1;
-
- // Recurse up through the parents to find the next group if needed.
- while (parentIndex != -1 && nextPageGroup == null) {
- StackEntry parentStackEntry = (StackEntry) stack.elementAt(parentIndex);
-
- nextPageGroup = parentStackEntry.getNextPageGroup(topEntry.getId());
- prevParentIndex = parentIndex;
- parentIndex = parentStackEntry.parentGroupIndex;
- topEntry = parentStackEntry;
- }
-
- return nextPageGroup == null ? null : new StackEntry(nextPageGroup, prevParentIndex);
- }
-
- private class StackEntry {
- public PageGroupEntry pageGroupEntry;
- public Stack pagesReturned; // Element = Interger of page indexes.
- public boolean pagesComplete;
- public int parentGroupIndex;
- public boolean ranOperations;
-
- public StackEntry(PageGroupEntry newPageGroupEntry, int parentIndex) {
- pageGroupEntry = newPageGroupEntry;
- pagesReturned = new Stack();
- pagesComplete = false;
- parentGroupIndex = parentIndex;
- ranOperations = false;
- }
-
- public StackEntry(StackEntry stackEntry) {
- pageGroupEntry = stackEntry.pageGroupEntry;
- pagesReturned = new Stack();
- pagesComplete = stackEntry.pagesComplete;
- parentGroupIndex = stackEntry.parentGroupIndex;
- ranOperations = stackEntry.ranOperations;
- pagesReturned.addAll(stackEntry.pagesReturned);
- }
-
- public String getId() {
- return pageGroupEntry.pageGroup.getPageGroupID();
- }
-
- public int findNextPageIndex() {
- int result = -1;
-
- if (!pagesComplete) {
- List pages = pageGroupEntry.getPages();
-
- int pageIndex = getTopPageIndex();
- String pageId = pageIndex == -1 ? null : ((IWizardPage) pages.get(pageIndex)).getName();
- String expectedId = pageIndex + 1 >= pages.size() ? null : ((IWizardPage) pages.get(pageIndex + 1)).getName();
- String newPageId = null;
-
- try {
- newPageId = pageGroupEntry.getPageHandler().getNextPage(pageId, expectedId);
- } catch (Exception exc) {
- Logger.getLogger().logError(exc);
- }
-
- if (newPageId != null && newPageId.equals(IDMPageHandler.SKIP_PAGE) && pageIndex >= 0 && pageIndex < pages.size() - 2) {
- result = pageIndex + 2;
- } else {
- result = pageGroupEntry.checkForSpecialIds(newPageId);
- }
- }
-
- return result;
- }
-
- public PageGroupEntry getNextPageGroup(String afterId) {
- PageGroupEntry result = null;
- String nextGroupID = null;
- String[] groupIDList = getGroupIDList();
-
- try {
- nextGroupID = pageGroupEntry.getPageGroupHandler().getNextPageGroup(afterId, groupIDList);
- } catch (Exception exc) {
- Logger.getLogger().logError(exc);
- }
-
- if (nextGroupID != null) {
- // Find this string in the list.
- for (int index = 0; index < groupIDList.length; index++) {
- if (groupIDList[index].equals(nextGroupID)) {
- result = (PageGroupEntry) pageGroupEntry.groupsThatFollow.elementAt(index);
- break;
- }
- }
- }
-
- return result;
- }
-
- private String[] getGroupIDList() {
- String[] result = new String[pageGroupEntry.groupsThatFollow.size()];
-
- for (int index = 0; index < pageGroupEntry.groupsThatFollow.size(); index++) {
- PageGroupEntry entry = (PageGroupEntry) pageGroupEntry.groupsThatFollow.elementAt(index);
-
- result[index] = entry.pageGroup.getPageGroupID();
- }
-
- return result;
- }
-
- private int getTopPageIndex() {
- return pagesReturned.empty() ? -1 : ((Integer) pagesReturned.peek()).intValue();
- }
- }
-
- private class PageGroupEntry {
- public IDMPageGroup pageGroup;
- public Vector groupsThatFollow;
- private IDMPageHandler pageHandler;
- private IDMPageGroupHandler pageGroupHandler;
- private boolean initialized;
-
- public PageGroupEntry(IDMPageGroup newPageGroup) {
- pageGroup = newPageGroup;
- groupsThatFollow = new Vector();
- initialized = false;
- }
-
- public IDMPageHandler getPageHandler() {
- if (!initialized)
- init();
-
- return pageHandler;
- }
-
- public IDMPageGroupHandler getPageGroupHandler() {
- if (!initialized)
- init();
-
- return pageGroupHandler;
- }
-
- public List getPages() {
- if (!initialized)
- init();
-
- return pageGroup.getPages(dataModel);
- }
-
- public PageGroupEntry(PageGroupEntry originalEntry) {
- pageGroup = originalEntry.pageGroup;
- groupsThatFollow = originalEntry.groupsThatFollow;
- pageHandler = originalEntry.pageHandler;
- pageGroupHandler = originalEntry.pageGroupHandler;
- }
-
- private void init() {
- try {
- pageHandler = pageGroup.getPageHandler(dataModel);
- pageGroupHandler = pageGroup.getPageGroupHandler(dataModel);
- } catch (Exception exc) {
- Logger.getLogger().logError(exc);
- }
-
- if (pageHandler == null)
- pageHandler = new SimplePageHandler();
-
- if (pageGroupHandler == null)
- pageGroupHandler = new SimplePageGroupHandler();
-
- initialized = true;
- }
-
- private int checkForSpecialIds(String pageId) {
- int result = -1;
-
- List pages = getPages();
-
- if (pages.isEmpty() || pageId == null)
- return -1;
-
- if (pageId.startsWith(IDMPageHandler.PAGE_AFTER)) {
- String afterID = pageId.substring(IDMPageHandler.PAGE_AFTER.length(), pageId.length());
- result = getIndexOf(afterID);
- result = result >= 0 && result < pages.size() - 1 ? result + 1 : -1;
- } else if (pageId.startsWith(IDMPageHandler.PAGE_BEFORE)) {
- String beforeID = pageId.substring(IDMPageHandler.PAGE_BEFORE.length(), pageId.length());
- result = getIndexOf(beforeID);
- result = result >= 1 && result < pages.size() ? result - 1 : -1;
- } else {
- result = getIndexOf(pageId);
- }
-
- return result;
- }
-
- private int getIndexOf(String pageId) {
- int result = -1;
-
- List pages = getPages();
- for (int index = 0; index < pages.size(); index++) {
- if (((IWizardPage) pages.get(index)).getName().equals(pageId)) {
- result = index;
- break;
- }
- }
-
- return result;
- }
-
- public boolean isInitialized() {
- return initialized;
- }
- }
-
- public void storeDefaultSettings(DataModelWizard wizard) {
- Iterator pageGroups = groupTable.values().iterator();
- while (pageGroups.hasNext()) {
- PageGroupEntry pageGroup = (PageGroupEntry) pageGroups.next();
- if (pageGroup.isInitialized()) {
- Iterator pages = pageGroup.getPages().iterator();
- while (pages.hasNext()) {
- IWizardPage page = (IWizardPage) pages.next();
- wizard.storeDefaultSettings(page);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableOperationWrapper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableOperationWrapper.java
deleted file mode 100644
index 4b26000..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableOperationWrapper.java
+++ /dev/null
@@ -1,45 +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.frameworks.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-public class RunnableOperationWrapper implements IRunnableWithProgress {
-
- private IUndoableOperation undoableOperation;
- private IStatus status;
-
- public RunnableOperationWrapper(IUndoableOperation undoableOperation) {
- this.undoableOperation = undoableOperation;
- }
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- status = undoableOperation.execute(monitor, null);
- if(status.getSeverity() == IStatus.ERROR){
- throw new InvocationTargetException(status.getException());
- }
- } catch (ExecutionException e) {
- throw new InvocationTargetException(e);
- }
- }
-
- public IStatus getStatus() {
- return status;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java
deleted file mode 100644
index 3df3904..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java
+++ /dev/null
@@ -1,79 +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.frameworks.internal.ui;
-
-
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-/**
- * This is a wrapper for our IHeadlessRunnableWithProgress to the IRunnableWithProgress. This class
- * needs to be used when running the operation from a IRunnableContext.
- *
- * @see IRunnableContext
- * @see JavaUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
- * @author: Administrator
- */
-public class RunnableWithProgressWrapper implements org.eclipse.jface.operation.IRunnableWithProgress {
- // //$NON-NLS-1$
- private IHeadlessRunnableWithProgress headlessRunnable;
-
- /**
- * RunnableWithProgressWrapper constructor comment.
- */
- public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- setHeadlessRunnable(aHeadlessRunnableWithProgress);
- }
-
- /**
- * Insert the method's description here. Creation date: (5/8/2001 1:29:52 PM)
- *
- * @return com.ibm.etools.j2ee.operations.IHeadlessRunnableWithProgress
- */
- protected org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress getHeadlessRunnable() {
- return headlessRunnable;
- }
-
- /**
- * Runs this operation. Progress should be reported to the given progress monitor. This method
- * is usually invoked by an <code>IRunnableContext</code>'s<code>run</code> method, which
- * supplies the progress monitor. A request to cancel the operation should be honored and
- * acknowledged by throwing <code>InterruptedException</code>.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive requests for
- * cancelation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception, it should wrap it inside
- * an <code>InvocationTargetException</code>; runtime exceptions are
- * automatically wrapped in an <code>InvocationTargetException</code> by the
- * calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
- public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, java.lang.InterruptedException {
- getHeadlessRunnable().run(monitor);
- }
-
- /**
- * Insert the method's description here. Creation date: (5/8/2001 1:29:52 PM)
- *
- * @param newHeadlessRunnable
- * com.ibm.etools.j2ee.operations.IHeadlessRunnableWithProgress
- */
- protected void setHeadlessRunnable(org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress newHeadlessRunnable) {
- headlessRunnable = newHeadlessRunnable;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java
deleted file mode 100644
index e316218..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java
+++ /dev/null
@@ -1,128 +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.common.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class SaveHandlerUI implements ISaveHandler {
- public static final String SAVE_FAILED = WTPCommonPlugin.getResourceString("16"); //$NON-NLS-1$
- public static final String BEGINNING_MESSAGE = WTPCommonPlugin.getResourceString("17"); //$NON-NLS-1$
- protected boolean isYesToAll = false;
- protected int referenceCount = 0;
-
- /**
- * SaveHandlerUI constructor comment.
- */
- public SaveHandlerUI() {
- super();
- }
-
- /**
- * access method comment.
- */
- public void access() {
- referenceCount++;
- }
-
- protected Shell getParentShellForDialog() {
- if (Display.getCurrent() != null)
- return Display.getCurrent().getActiveShell();
-
- return null;
- }
-
- protected Display getDisplay() {
- Display result = Display.getCurrent();
- return result == null ? Display.getDefault() : result;
- }
-
- public void handleSaveFailed(SaveFailedException ex, IProgressMonitor monitor) {
- if (referenceCount > 1)
- //Let the outermost reference handle it
- throw ex;
- String exMsg = ex.getInnerMostNestedException() == null ? ex.getMessage() : ex.getInnerMostNestedException().getMessage();
- final String message = BEGINNING_MESSAGE + ":\n" + exMsg;//$NON-NLS-1$
- getDisplay().syncExec(new Runnable() {
- public void run() {
- MessageDialog.openError(getParentShellForDialog(), SAVE_FAILED, message);
- }
- });
- if (monitor != null)
- monitor.setCanceled(true);
- else
- throw ex;
- }
-
- protected boolean promptUserToSaveReadOnly(IFile aFile) {
-
- String[] buttonStrings = {WTPCommonPlugin.getResourceString("Yes_UI_"), WTPCommonPlugin.getResourceString("Yes_To_All_UI_"), WTPCommonPlugin.getResourceString("No_UI_")}; //$NON-NLS-3$ = "No" //$NON-NLS-2$ = "Yes To All" //$NON-NLS-1$ = "Yes"
- String title = WTPCommonPlugin.getResourceString("Saving_Read-Only_File_UI_"); //$NON-NLS-1$ = "Saving Read-Only File"
- String message = WTPCommonPlugin.getResourceString("2concat_INFO_", (new Object[]{aFile.getFullPath()})); //$NON-NLS-1$ = "The file {0} is read-only and cannot be saved. Would you like to make it editable and save anyway?"
-
- final MessageDialog dialog = new MessageDialog(getParentShellForDialog(), title, null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, buttonStrings, 0); // Yes is the default
-
- final int[] ret = new int[1];
- getDisplay().syncExec(new Runnable() {
- public void run() {
- dialog.setBlockOnOpen(true);
- ret[0] = dialog.open();
- }
- });
-
- switch (ret[0]) {
- case 0 : {
- return true;
- }
- case 1 : {
- isYesToAll = true;
- return true;
- }
- case 2 : {
- return false;
- }
- }
- return false;
- }
-
- /**
- * release method comment.
- */
- public void release() {
- referenceCount--;
- if (referenceCount == 0)
- isYesToAll = false;
-
- }
-
- /**
- * shouldContinueAndMakeFileEditable method comment.
- */
- public boolean shouldContinueAndMakeFileEditable(IFile aFile) {
- boolean yes = isYesToAll || promptUserToSaveReadOnly(aFile);
- if (yes)
- aFile.getResourceAttributes().setReadOnly(false);
- return yes;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
deleted file mode 100644
index c68ee57..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageGroupHandler.java
+++ /dev/null
@@ -1,39 +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.frameworks.internal.ui;
-
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-
-public class SimplePageGroupHandler implements IDMPageGroupHandler {
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- if (pageGroupIDs == null || pageGroupIDs.length == 0)
- return null;
-
- if (currentPageGroupID == null)
- return pageGroupIDs[0];
-
- String result = null;
-
- for (int index = 0; index < pageGroupIDs.length; index++) {
- if (pageGroupIDs[index].equals(currentPageGroupID)) {
- // We found the currentPageGroupID, so we want to return the next one in the
- // array if there is one.
- if (index + 1 < pageGroupIDs.length) {
- result = pageGroupIDs[index + 1];
- } else {
- result = null;
- }
-
- break;
- }
- }
-
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
deleted file mode 100644
index 44db38f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimplePageHandler.java
+++ /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
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-public class SimplePageHandler implements IDMPageHandler
-{
- public String getNextPage(String currentPageName, String expectedNextPageName)
- {
- return expectedNextPageName;
- }
-
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName)
- {
- return expectedPreviousPageName;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimpleValidateEditContextUI.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimpleValidateEditContextUI.java
deleted file mode 100644
index e9bb587..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SimpleValidateEditContextUI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.frameworks.internal.ISimpleValidateEditContext;
-import org.eclipse.wst.common.frameworks.internal.SimpleValidateEditContextHeadless;
-
-public class SimpleValidateEditContextUI extends SimpleValidateEditContextHeadless implements ISimpleValidateEditContext {
-
- protected IStatus validateEditImpl(final IFile[] filesToValidate) {
- final IStatus [] status = new IStatus[1];
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- status[0] = ResourcesPlugin.getWorkspace().validateEdit(filesToValidate, Display.getCurrent().getActiveShell());
- }
- });
- return status[0];
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java
deleted file mode 100644
index 7f3c7b4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java
+++ /dev/null
@@ -1,135 +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.common.frameworks.internal.ui;
-
-import java.awt.event.ActionListener;
-
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Insert the type's description here. Creation date: (8/30/2001 4:00:28 PM)
- *
- * @author: Administrator
- */
-public class TimedKeyListener extends Timer implements KeyListener, MouseListener, MouseTrackListener, ModifyListener {
-
- protected Widget monitoringTarget;
-
- private final static int TIME_LIMIT = 200;
-
- /**
- * J2EETimedKeyListener constructor comment.
- *
- * @param delay
- * int
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedKeyListener(int delay, ActionListener listener) {
- super(delay, listener);
- setRepeats(false);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/30/2001 4:43:33 PM)
- *
- * @param a
- * java.awt.event.ActionListener
- */
- public TimedKeyListener(ActionListener listener) {
- this(TIME_LIMIT, listener);
- }
-
- /**
- * Sent when a key is pressed on the system keyboard.
- *
- * @param e
- * an event containing information about the key press
- */
- public void keyPressed(org.eclipse.swt.events.KeyEvent e) {
- }
-
- /**
- * Sent when a key is released on the system keyboard.
- *
- * @param e
- * an event containing information about the key release
- */
- public void keyReleased(org.eclipse.swt.events.KeyEvent e) {
- // Replaced with SWT.Modify -- see modifyText() in this class
- // monitoringTarget = (Widget) e.getSource();
- // restart();
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(MouseEvent)
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseDown(MouseEvent)
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseUp(MouseEvent)
- */
- public void mouseUp(MouseEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(MouseEvent)
- */
- public void mouseEnter(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(MouseEvent)
- */
- public void mouseExit(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(MouseEvent)
- */
- public void mouseHover(MouseEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.util.Timer#getSource()
- */
- protected Object getSource() {
- return monitoringTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
- */
- public void modifyText(ModifyEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java
deleted file mode 100644
index 98045fe..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java
+++ /dev/null
@@ -1,55 +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.common.frameworks.internal.ui;
-
-/**
- * This class perform the same function as the J2EETimedKeyListener but using the Modify SWT event
- * instead of the KeyUp. Creation date: (9/10/2001 11:46:51 AM)
- *
- * @author: Administrator
- */
-import java.awt.event.ActionListener;
-
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Widget;
-
-public class TimedModifyListener extends TimedKeyListener implements ModifyListener {
- /**
- * J2EETimedModefyListener constructor comment.
- *
- * @param delay
- * int
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedModifyListener(int delay, ActionListener listener) {
- super(delay, listener);
- }
-
- /**
- * J2EETimedModefyListener constructor comment.
- *
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedModifyListener(ActionListener listener) {
- super(listener);
- }
-
- /*
- * Re/Start the timer
- */
- public void modifyText(org.eclipse.swt.events.ModifyEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java
deleted file mode 100644
index 76b11c7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java
+++ /dev/null
@@ -1,253 +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.frameworks.internal.ui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Timer {
- /**
- * DoPostEvent is a runnable class that fires actionEvents to the listeners on the
- * EventDispatchThread, via invokeLater.
- *
- * @see #post
- */
- class DoPostEvent implements Runnable {
- public void run() {
- if (eventQueued) {
- fireActionPerformed(new ActionEvent(getSource(), 0, null));
- cancelEvent();
- }
- }
-
- Timer getTimer() {
- return Timer.this;
- }
- }
-
- protected ListenerList listenerList = new ListenerList();
- boolean eventQueued = false;
- int initialDelay, delay;
- boolean repeats = true, coalesce = true;
- private Runnable doPostEvent;
- // These fields are maintained by TimerQueue.
- // eventQueued can also be reset by the TimerQueue, but will only ever
- // happen in applet case when TimerQueues thread is destroyed.
- long expirationTime;
- Timer nextTimer;
- boolean running;
-
- /**
- * Creates a Timer that will notify its listeners every <i>delay </i> milliseconds.
- *
- * @param delay
- * The number of milliseconds between listener notification
- * @param listener
- * An initial listener
- * @see #setInitialDelay
- * @see #setRepeats
- */
- public Timer(int delay, ActionListener listener) {
- super();
- this.delay = delay;
- this.initialDelay = delay;
-
- doPostEvent = new DoPostEvent();
-
- if (listener != null) {
- addActionListener(listener);
- }
- }
-
- /**
- * Adds an actionListener to the Timer
- */
- public void addActionListener(ActionListener listener) {
- listenerList.add(listener);
- }
-
- synchronized void cancelEvent() {
- eventQueued = false;
- }
-
- /**
- * Notify all listeners that have registered interest for notification on this event type. The
- * event instance is lazily created using the parameters passed into the fire method.
- *
- * @see EventListenerList
- */
- protected void fireActionPerformed(ActionEvent e) {
- // Guaranteed to return a non-null array
- ActionListener[] listeners = listenerList.getListenerList();
-
- // Process the listeners last to first, notifying
- // those that are interested in this event
- for (int i = listeners.length - 1; i >= 0; i -= 1) {
- listeners[i].actionPerformed(e);
- }
- }
-
- /**
- * Returns the Timer's delay.
- *
- * @see #setDelay
- */
- public int getDelay() {
- return delay;
- }
-
- /**
- * Returns the Timer's initial delay.
- *
- * @see #setDelay
- */
- public int getInitialDelay() {
- return initialDelay;
- }
-
- /**
- * Returns <b>true </b> if the Timer coalesces multiple pending <b>performCommand() </b>
- * messages.
- *
- * @see #setCoalesce
- */
- public boolean isCoalesce() {
- return coalesce;
- }
-
- /**
- * Returns <b>true </b> if the Timer will send a <b>actionPerformed() </b> message to its
- * listeners multiple times.
- *
- * @see #setRepeats
- */
- public boolean isRepeats() {
- return repeats;
- }
-
- /**
- * Returns <b>true </b> if the Timer is running.
- *
- * @see #start
- */
- public boolean isRunning() {
- return timerQueue().containsTimer(this);
- }
-
- synchronized void post() {
- if (!eventQueued) {
- eventQueued = true;
- org.eclipse.swt.widgets.Display.getDefault().asyncExec(doPostEvent);
- }
- }
-
- /**
- * Removes an ActionListener from the Timer.
- */
- public void removeActionListener(ActionListener listener) {
- listenerList.remove(listener);
- }
-
- /**
- * Restarts a Timer, canceling any pending firings, and causing it to fire with its initial
- * dely.
- */
- public void restart() {
- stop();
- start();
- }
-
- /**
- * Sets whether the Timer coalesces multiple pending ActionEvent firings. A busy application may
- * not be able to keep up with a Timer's message generation, causing multiple
- * <b>actionPerformed() </b> message sends to be queued. When processed, the application sends
- * these messages one after the other, causing the Timer's listeners to receive a sequence of
- * <b>actionPerformed() </b> messages with no delay between them. Coalescing avoids this
- * situation by reducing multiple pending messages to a single message send. Timers coalesce
- * their message sends by default.
- */
- public void setCoalesce(boolean flag) {
- coalesce = flag;
- }
-
- /**
- * Sets the Timer's delay, the number of milliseconds between successive <b>actionPerfomed()
- * </b> messages to its listeners
- *
- * @see #setInitialDelay
- */
- public void setDelay(int delay) {
- if (delay < 0) {
- String msg = WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.Timer_UI_0, new Object[]{Integer.toString(delay)});
- throw new IllegalArgumentException(msg);
- }
- this.delay = delay;
- }
-
- /**
- * Sets the Timer's initial delay. This will be used for the first "ringing" of the Timer only.
- * Subsequent ringings will be spaced using the delay property.
- *
- * @see #setDelay
- */
- public void setInitialDelay(int initialDelay) {
- if (initialDelay < 0) {
- String msg = WTPCommonUIResourceHandler.getString(WTPCommonUIResourceHandler.Timer_UI_1, new Object[]{Integer.toString(initialDelay)});
- throw new IllegalArgumentException(msg);
- }
- this.initialDelay = initialDelay;
- }
-
- /**
- * If <b>flag </b> is <b>false </b>, instructs the Timer to send <b>actionPerformed() </b> to
- * its listeners only once, and then stop.
- */
- public void setRepeats(boolean flag) {
- repeats = flag;
- }
-
- /**
- * Starts the Timer, causing it to send <b>actionPerformed() </b> messages to its listeners.
- *
- * @see #stop
- */
- public void start() {
- timerQueue().addTimer(this, System.currentTimeMillis() + getInitialDelay());
- }
-
- /**
- * Stops a Timer, causing it to stop sending <b>actionPerformed() </b> messages to its Target.
- *
- * @see #start
- */
- public void stop() {
- timerQueue().removeTimer(this);
- cancelEvent();
- }
-
- /**
- * Returns the timer queue.
- */
- TimerQueue timerQueue() {
- return TimerQueue.singleton();
- }
-
- /**
- * Return the source for the ActionEvent that is fired.
- *
- * @return
- */
- protected Object getSource() {
- return this;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java
deleted file mode 100644
index 62442f4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java
+++ /dev/null
@@ -1,231 +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.frameworks.internal.ui;
-
-
-
-
-class TimerQueue implements Runnable {
- private static TimerQueue singleton;
- Timer firstTimer;
- boolean running;
- private static final Object classLock = new Object();
-
- /**
- * Constructor for TimerQueue.
- */
- public TimerQueue() {
- super();
-
- // Now start the TimerQueue thread.
- start();
- }
-
- synchronized void addTimer(Timer timer, long expirationTime) {
- Timer previousTimer;
- Timer nextTimer;
-
- // If the Timer is already in the queue, then ignore the add.
- if (timer.running) {
- return;
- }
-
- previousTimer = null;
- nextTimer = firstTimer;
-
- // Insert the Timer into the linked list in the order they will
- // expire. If two timers expire at the same time, put the newer entry
- // later so they expire in the order they came in.
-
- while (nextTimer != null) {
- if (nextTimer.expirationTime > expirationTime)
- break;
-
- previousTimer = nextTimer;
- nextTimer = nextTimer.nextTimer;
- }
-
- if (previousTimer == null) {
- firstTimer = timer;
- } else {
- previousTimer.nextTimer = timer;
- }
-
- timer.expirationTime = expirationTime;
- timer.nextTimer = nextTimer;
- timer.running = true;
- notify();
- }
-
- synchronized boolean containsTimer(Timer timer) {
- return timer.running;
- }
-
- /**
- * If there are a ton of timers, this method may never return. It loops checking to see if the
- * head of the Timer list has expired. If it has, it posts the Timer and reschedules it if
- * necessary.
- */
- synchronized long postExpiredTimers() {
- Timer timer;
- long currentTime;
- long timeToWait;
-
- // The timeToWait we return should never be negative and only be zero
- // when we have no Timers to wait for.
-
- do {
- timer = firstTimer;
- if (timer == null)
- return 0;
-
- currentTime = System.currentTimeMillis();
- timeToWait = timer.expirationTime - currentTime;
-
- if (timeToWait <= 0) {
- try {
- timer.post(); // have timer post an event
- } catch (SecurityException e) {
- }
-
- // Remove the timer from the queue
- removeTimer(timer);
-
- // This tries to keep the interval uniform at
- // the cost of drift.
- if (timer.isRepeats()) {
- addTimer(timer, currentTime + timer.getDelay());
- }
- }
-
- // Allow other threads to call addTimer() and removeTimer()
- // even when we are posting Timers like mad. Since the wait()
- // releases the lock, be sure not to maintain any state
- // between iterations of the loop.
-
- try {
- wait(1);
- } catch (InterruptedException e) {
- }
- } while (timeToWait <= 0);
-
- return timeToWait;
- }
-
- synchronized void removeTimer(Timer timer) {
- Timer previousTimer;
- Timer nextTimer;
- boolean found;
-
- if (!timer.running)
- return;
-
- previousTimer = null;
- nextTimer = firstTimer;
- found = false;
-
- while (nextTimer != null) {
- if (nextTimer == timer) {
- found = true;
- break;
- }
-
- previousTimer = nextTimer;
- nextTimer = nextTimer.nextTimer;
- }
-
- if (!found)
- return;
-
- if (previousTimer == null) {
- firstTimer = timer.nextTimer;
- } else {
- previousTimer.nextTimer = timer.nextTimer;
- }
-
- timer.expirationTime = 0;
- timer.nextTimer = null;
- timer.running = false;
- }
-
- public synchronized void run() {
- long timeToWait;
-
- try {
- while (running) {
- timeToWait = postExpiredTimers();
- try {
- wait(timeToWait);
- } catch (InterruptedException e) {
- }
- }
- } catch (ThreadDeath td) {
- running = false;
- // Mark all the timers we contain as not being queued.
- Timer timer = firstTimer;
- while (timer != null) {
- timer.eventQueued = false;
- timer = timer.nextTimer;
- }
- synchronized (this) {
- if (!this.running)
- start();
- }
- throw td;
- }
- }
-
- public static TimerQueue singleton() {
- if (singleton == null)
- synchronized (classLock) {
- singleton = new TimerQueue();
- }
- return singleton;
- }
-
- synchronized void start() {
- if (running) {
- throw new RuntimeException(WTPCommonUIResourceHandler.TimerQueue_ERROR_0);
- }
- Thread timerThread = new Thread(this, "TimerQueue");//$NON-NLS-1$
- try {
- timerThread.setDaemon(true);
- } catch (SecurityException e) {
- }
- timerThread.start();
- running = true;
- }
-
- synchronized void stop() {
- running = false;
- notify();
- }
-
- public synchronized String toString() {
- StringBuffer buf;
- Timer nextTimer;
-
- buf = new StringBuffer();
- buf.append("TimerQueue (");//$NON-NLS-1$
-
- nextTimer = firstTimer;
- while (nextTimer != null) {
- buf.append(nextTimer.toString());
-
- nextTimer = nextTimer.nextTimer;
- if (nextTimer != null)
- buf.append(", ");//$NON-NLS-1$
- }
-
- buf.append(")");//$NON-NLS-1$
- return buf.toString();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java
deleted file mode 100644
index 8c7e54e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java
+++ /dev/null
@@ -1,94 +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 12, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IIdentifierListener;
-import org.eclipse.ui.activities.IdentifierEvent;
-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.IEnablementManager;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-class UIEnablementIdentifier extends EnablementIdentifier implements IIdentifierListener {
-
- private IIdentifier activityIdentifier;
-
- /**
- * @param id
- * @param project
- */
- public UIEnablementIdentifier(String id, IProject project) {
- super(id, project);
- IActivityManager manager = getActivityManager();
- if (manager != null) {
- activityIdentifier = getActivityManager().getIdentifier(id);
- activityIdentifier.addIdentifierListener(this);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.activities.IIdentifierListener#identifierChanged(org.eclipse.ui.activities.IdentifierEvent)
- */
- public void identifierChanged(IdentifierEvent identifierEvent) {
- boolean enabledChanged = resetEnabled();
- EnablementIdentifierEvent evt = new EnablementIdentifierEvent(this, false, enabledChanged);
- fireIdentifierChanged(evt);
- }
-
- protected IActivityManager getActivityManager() {
- return ((UIEnablementManager) IEnablementManager.INSTANCE).getActivityManager();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclispe.wst.common.frameworks.internal.enablement.EnablementIdentifier#getNewEnabled()
- */
- protected boolean getNewEnabled() {
- IIdentifier identifier = getActivityIdentifier();
- if (identifier != null)
- return identifier.isEnabled() && super.getNewEnabled();
- else
- return false;
- }
-
-
- protected IIdentifier getActivityIdentifier() {
- if (activityIdentifier == null){
- IActivityManager manager = getActivityManager();
- if (manager != null) {
- activityIdentifier = getActivityManager().getIdentifier(getId());
- activityIdentifier.addIdentifierListener(this);
- }
- }
- return activityIdentifier;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java
deleted file mode 100644
index f427422..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 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.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-
-/**
- * @author mdelder
- */
-public class UIEnablementManager extends EnablementManager {
-
- private IWorkbenchActivitySupport activitySupport = null;
-
- public UIEnablementManager() {
- super();
- }
-
- protected IActivityManager getActivityManager() {
- if (getActivitySupport() != null)
- return getActivitySupport().getActivityManager();
- else
- return null;
- }
-
- /**
- * @return Returns the activitySupport.
- */
- protected IWorkbenchActivitySupport getActivitySupport() {
- if (activitySupport == null)
- activitySupport = initActivitySupport();
- return activitySupport;
- }
-
- private IWorkbenchActivitySupport initActivitySupport() {
- IWorkbench work = null;
- try {
- work = PlatformUI.getWorkbench();
- } catch (IllegalStateException ex) {
- //Not initialized yet
- }
- return (work != null) ? work.getActivitySupport() : null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager#createIdentifier(java.lang.String,
- * org.eclipse.core.resources.IProject)
- */
- protected EnablementIdentifier createIdentifier(String identifierId, IProject project) {
- return new UIEnablementIdentifier(identifierId, project);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java
deleted file mode 100644
index 53ccd53..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java
+++ /dev/null
@@ -1,187 +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 Aug 5, 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.frameworks.internal.ui;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-
-
-/**
- * @author dfholt
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class UIOperationHandler implements IOperationHandler {
- protected Shell parentShell;
- final public static String DEFAULT_INFORMATION = "Information"; //$NON-NLS-1$
- final public static String DEFAULT_ERROR = "Error"; //$NON-NLS-1$
- final public static String DEFAULT_CONFIRM = "Confirm"; //$NON-NLS-1$
- protected String informationTitle = DEFAULT_INFORMATION;
- protected String confirmTitle = DEFAULT_CONFIRM;
- protected String errorTitle = DEFAULT_ERROR;
-
- /**
- * UIOperationHandler constructor comment.
- */
- public UIOperationHandler() {
- super();
- }
-
- /**
- * UIOperationHandler constructor comment.
- */
- public UIOperationHandler(Shell parent) {
- super();
- parentShell = parent;
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message) {
- return MessageDialog.openQuestion(getParentShell(), getConfirmTitle(), message);
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message, String[] items) {
- return ListMessageDialog.openQuestion(getParentShell(), getConfirmTitle(), message, items);
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue. The boolean array
- * will return two booleans. The first indicates their response to the original question and the
- * second indicates if they selected the apply to all check box.
- *
- * Return the return code for the dialog. 0 = Yes, 1 = Yes to all, 2 = No
- */
- public int canContinueWithAllCheck(String message) {
- MessageDialog dialog = new MessageDialog(getParentShell(), getConfirmTitle(), null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_LABEL}, 1); // yes
- // is
- // the
- // default
- return dialog.open();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#canContinueWithAllCheckAllowCancel(java.lang.String)
- */
- public int canContinueWithAllCheckAllowCancel(String message) {
- MessageDialog dialog = new MessageDialog(getParentShell(), getConfirmTitle(), null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}, 1); // yes
- // is
- // the
- // default
- return dialog.open();
- }
-
- /**
- * An error has occurred
- */
- public void error(String message) {
- MessageDialog.openError(getParentShell(), getErrorTitle(), message);
- }
-
- /**
- * The dialog title to be used for confirmations
- */
- public java.lang.String getConfirmTitle() {
- return confirmTitle;
- }
-
- /**
- * The dialog title to be used for errors
- */
- public java.lang.String getErrorTitle() {
- return errorTitle;
- }
-
- /**
- * The dialog title to be used for information
- */
- public java.lang.String getInformationTitle() {
- return informationTitle;
- }
-
- public Shell getParentShell() {
- if (parentShell == null)
- parentShell = WTPUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow().getShell();
-
- return parentShell;
- }
-
- /**
- * An informational message needs to be presented
- */
- public void inform(String message) {
- MessageDialog.openInformation(getParentShell(), getInformationTitle(), message);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newConfirmTitle
- * java.lang.String
- */
- public void setConfirmTitle(java.lang.String newConfirmTitle) {
- confirmTitle = newConfirmTitle;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newErrorTitle
- * java.lang.String
- */
- public void setErrorTitle(java.lang.String newErrorTitle) {
- errorTitle = newErrorTitle;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newInformationTitle
- * java.lang.String
- */
- public void setInformationTitle(java.lang.String newInformationTitle) {
- informationTitle = newInformationTitle;
- }
-
- /**
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#getContext()
- */
- public Object getContext() {
- return getParentShell();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java
deleted file mode 100644
index db7ba7a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java
+++ /dev/null
@@ -1,52 +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 27, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jem.util.UITester;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UITesterImpl implements UITester {
-
- /**
- *
- */
- public UITesterImpl() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.UITester#isCurrentContextUI()
- */
- public boolean isCurrentContextUI() {
- try {
- return PlatformUI.isWorkbenchRunning() || PlatformUI.getWorkbench().isClosing();
- } catch (Exception e) {
- //Ignore, workbench must not be running
- return false;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java
deleted file mode 100644
index 508f6b6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java
+++ /dev/null
@@ -1,200 +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.common.frameworks.internal.ui;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.widgets.Control;
-
-/**
- * This object encompas a set of Validation status Creation date: (9/10/2001 5:35:12 PM)
- *
- * @author: Administrator
- */
-public class ValidationStatus {
-
- // TODO make all these vars private and change errMsgs & errStatus to maps so the same methods
- // can be used as with warnings & info
- Hashtable errMsgs = new Hashtable();
- Hashtable errStatus = new Hashtable();
- Hashtable tControls = new Hashtable();
- Map warnMsgs;
- Map warnStatus;
- Map infoMsgs;
- Map infoStatus;
-
- /**
- * ValidationStatus constructor comment.
- */
- public ValidationStatus() {
- super();
- }
-
- /*
- * Look for any error. If there is more than one, return errors according to their key. i.e.,
- * lower key errors will be returned first.
- */
- public String getLastErrMsg() {
- //TODO once ivars are changed to maps, pass this to getLastMsg()
- Enumeration e = errStatus.keys();
- String[] errs = new String[errStatus.size()];
- for (int i = 0; i < errs.length; i++)
- errs[i] = null;
- boolean foundOne = false;
- while (e.hasMoreElements()) {
- Integer key = (Integer) e.nextElement();
- if (!((Boolean) errStatus.get(key)).booleanValue()) {
- errs[key.intValue() % errs.length] = (String) errMsgs.get(key);
- foundOne = true;
- }
- }
- if (foundOne)
- for (int i = 0; i < errs.length; i++)
- if (errs[i] != null)
- return errs[i];
- return null;
- }
-
- private Map getWarningMsgs() {
- if (warnMsgs == null)
- warnMsgs = new HashMap();
- return warnMsgs;
- }
-
- private Map getWarningStatusMap() {
- if (warnStatus == null)
- warnStatus = new HashMap();
- return warnStatus;
- }
-
- private Map getInfoMsgs() {
- if (infoMsgs == null)
- infoMsgs = new HashMap();
- return infoMsgs;
- }
-
- private Map getInfoStatusMap() {
- if (infoStatus == null)
- infoStatus = new HashMap();
- return infoStatus;
- }
-
- public String getLastWarningMsg() {
- return getLastMsg(warnStatus, warnMsgs);
- }
-
- public String getLastInfoMsg() {
- return getLastMsg(infoStatus, infoMsgs);
- }
-
- /*
- * Look for any status. If there is more than one, return status according to their key. i.e.,
- * lower key status will be returned first.
- */
- private String getLastMsg(Map statusMap, Map msgMap) {
- if (statusMap == null)
- return null;
- Iterator e = statusMap.keySet().iterator();
- String[] infos = new String[statusMap.size()];
- for (int i = 0; i < infos.length; i++)
- infos[i] = null;
- boolean foundOne = false;
- while (e.hasNext()) {
- Integer key = (Integer) e.next();
- if (!((Boolean) statusMap.get(key)).booleanValue()) {
- infos[key.intValue() % infos.length] = (String) msgMap.get(key);
- foundOne = true;
- }
- }
- if (foundOne)
- for (int i = 0; i < infos.length; i++)
- if (infos[i] != null)
- return infos[i];
- return null;
- }
-
- public String getLastErrMsgAndFocus() {
-
- Enumeration e = errStatus.keys();
-
- Integer theOne = null;
- while (e.hasMoreElements()) {
- Integer key = (Integer) e.nextElement();
- if (!((Boolean) errStatus.get(key)).booleanValue()) {
- if (theOne == null || key.intValue() < theOne.intValue()) {
- theOne = key;
- }
- }
- }
- if (theOne != null) {
- Control control = (Control) tControls.get(theOne);
- if (control != null) {
- control.setFocus();
- }
- return ((String) errMsgs.get(theOne));
- }
- return null;
- }
-
- public boolean hasError(Integer key) {
- Boolean stat = (Boolean) errStatus.get(key);
- if (stat != null)
- return stat.booleanValue();
- return true;
- }
-
- public void setControl(Integer key, Control control) {
- tControls.put(key, control);
- }
-
- public void setErrorStatus(Integer key, Boolean status, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, status);
- }
-
- public void setErrorStatus(Integer key, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, new Boolean(false));
- }
-
- public void setWarningStatus(Integer key, String msg) {
- getWarningMsgs().put(key, msg);
- getWarningStatusMap().put(key, new Boolean(false));
- }
-
- public void setInfoStatus(Integer key, String msg) {
- getInfoMsgs().put(key, msg);
- getInfoStatusMap().put(key, new Boolean(false));
- }
-
- public void setOKStatus(Integer key) {
- errMsgs.put(key, ""); //$NON-NLS-1$
- errStatus.put(key, new Boolean(true));
- if (warnMsgs != null)
- warnMsgs.put(key, ""); //$NON-NLS-1$
- if (warnStatus != null)
- warnStatus.put(key, new Boolean(true));
- if (infoMsgs != null)
- infoMsgs.put(key, ""); //$NON-NLS-1$
- if (infoStatus != null)
- infoStatus.put(key, new Boolean(true));
- }
-
- public void setStatus(Integer key, boolean ok, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, new Boolean(ok));
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java
deleted file mode 100644
index a8440eb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java
+++ /dev/null
@@ -1,81 +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 4, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.wst.common.frameworks.internal.activities.WTPActivityBridgeHelper;
-
-
-/**
- * @author jsholl
- *
- */
-public class WTPActivityBridgeHelperImpl implements WTPActivityBridgeHelper {
-
- private IWorkbenchActivitySupport workbenchActivitySupport = null;
- private IActivityManager activityManager = null;
-
- public WTPActivityBridgeHelperImpl() {
- workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
- activityManager = workbenchActivitySupport.getActivityManager();
- }
-
- public void enableActivity(String activityID, boolean enabled) {
- Set enabledActivities = activityManager.getEnabledActivityIds();
- Set newEnabledActivities = null;
- if (enabled && !enabledActivities.contains(activityID)) {
- newEnabledActivities = new HashSet();
- newEnabledActivities.addAll(enabledActivities);
- newEnabledActivities.add(activityID);
- }
- if (!enabled && enabledActivities.contains(activityID)) {
- newEnabledActivities = new HashSet();
- newEnabledActivities.addAll(enabledActivities);
- newEnabledActivities.remove(activityID);
- }
- if (null != newEnabledActivities) {
- workbenchActivitySupport.setEnabledActivityIds(newEnabledActivities);
- }
- }
-
- public Set getEnabledActivityIds() {
- return activityManager.getEnabledActivityIds();
- }
-
- public void setEnabledActivityIds(Set activityIDs) {
- workbenchActivitySupport.setEnabledActivityIds(activityIDs);
- }
-
- public Set getActivityIDsFromContribution(final String localID, final String pluginID) {
- IIdentifier identifier = activityManager.getIdentifier(WorkbenchActivityHelper.createUnifiedId(new IPluginContribution() {
- public String getLocalId() {
- return localID;
- }
-
- public String getPluginId() {
- return pluginID;
- }
- }));
- return identifier.getActivityIds();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.java
deleted file mode 100644
index 37a0221..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.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
- *******************************************************************************/
-/*
- * Created on Apr 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WTPActivityHelper {
-
- /**
- * @return whether the UI is set up to filter contributions (has defined activity categories).
- */
- public static final boolean isFiltering() {
- return !PlatformUI.getWorkbench().getActivitySupport().getActivityManager().getDefinedActivityIds().isEmpty();
- }
-
- public static boolean allowUseOf(Object object) {
- if (!isFiltering())
- return true;
- if (object instanceof IPluginContribution) {
- IPluginContribution contribution = (IPluginContribution) object;
- if (contribution.getPluginId() != null) {
- IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
- IIdentifier identifier = workbenchActivitySupport.getActivityManager().getIdentifier(createUnifiedId(contribution));
- return identifier.isEnabled();
- }
- }
- return true;
- }
-
-
- public static final String createUnifiedId(IPluginContribution contribution) {
- if (contribution.getPluginId() != null)
- return contribution.getPluginId() + '/' + contribution.getLocalId();
- return contribution.getLocalId();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java
deleted file mode 100644
index 3805719..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java
+++ /dev/null
@@ -1,69 +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 May 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-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 WTPCommonUIResourceHandler extends NLS {
- private static final String BUNDLE_NAME = "wtpcommonui";//$NON-NLS-1$
-
- private WTPCommonUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String Project_location_;
- public static String WTPOperationAction_UI_1;
- public static String MasterDescriptor_UI_1;
- public static String WTPOptionalOperationDataModel_UI_1;
- public static String WTPOperationAction_UI_0;
- public static String WTPOptionalOperationDataModel_UI_0;
- public static String MULTIPLE_MODULE_PREF_TEXT;
- public static String IActionWTPOperation_UI_0;
- public static String MasterDescriptor_ERROR_2;
- public static String Name_;
- public static String WTPWizard_UI_0;
- public static String WTPWizard_UI_1;
- public static String WTPWizard_UI_2;
- public static String Browse_;
- public static String ExtendableWizard_UI_0;
- public static String ExtendedWizardPage_ERROR_1;
- public static String ExtendedWizardPage_ERROR_0;
- public static String WTPActionDialog_UI_0;
- public static String TimerQueue_ERROR_0;
- public static String Timer_UI_1;
- public static String Timer_UI_0;
- public static String WizardPageExtensionManager_UI_4;
- public static String WizardPageExtensionManager_UI_3;
- public static String WizardPageExtensionManager_UI_2;
- public static String WizardPageExtensionManager_UI_1;
- public static String WizardPageExtensionManager_UI_0;
- public static String Delete_UI_0;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WTPCommonUIResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java
deleted file mode 100644
index faaa453..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 16, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface WTPGenericActionIds {
-
- String CUT = "org.eclipse.wst.common.generic.Cut"; //$NON-NLS-1$
- String COPY = "org.eclipse.wst.common.generic.Copy"; //$NON-NLS-1$
- String PASTE = "org.eclipse.wst.common.generic.Paste"; //$NON-NLS-1$
- String RENAME = "org.eclipse.wst.common.generic.Rename"; //$NON-NLS-1$
- String DELETE = "org.eclipse.wst.common.generic.Delete"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java
deleted file mode 100644
index 3f27cb9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java
+++ /dev/null
@@ -1,140 +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.frameworks.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WTPUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks.ui"; //$NON-NLS-1$
- public static final String EXTENDED_VIEWER_REGISTRY_EXTENSION_POINT = "extendedViewer"; //$NON-NLS-1$
- // The shared instance.
- private static WTPUIPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public WTPUIPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.frameworks.internal.ui.WTPUIPluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message) {
- return createErrorStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message, Throwable exception) {
- return new Status(IStatus.ERROR, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * Returns the shared instance.
- */
- public static WTPUIPlugin getDefault() {
- return plugin;
- }
-
- public static Logger getLogger() {
- return Logger.getLogger(PLUGIN_ID);
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Return the workbench
- *
- * This method is internal to the j2ee plugin and must not be called by any other plugins.
- */
-
- public static IWorkbench getPluginWorkbench() {
- return getDefault().getWorkbench();
-
- }
-
- public static RunnableOperationWrapper getRunnableWithProgress(final IUndoableOperation operation) {
- return new RunnableOperationWrapper(operation);
- }
-
- public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = WTPUIPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static void log( final Throwable e )
- {
- final String msg = e.getMessage() + ""; //$NON-NLS-1$
- log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
- public static void log( final IStatus status )
- {
- getDefault().getLog().log( status );
- }
-
- public static void log( final String msg )
- {
- log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, null ) );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index fed29fc..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,82 +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.common.frameworks.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * An operation which delegates its work to a runnable that modifies the workspace.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
- protected List fRunnables;
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- */
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule);
- fRunnables = nestedRunnablesWithProgress;
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super();
- fRunnables = nestedRunnablesWithProgress;
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- *
- * @param content
- * the runnable to delegate to when this operation is executed
- */
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super();
- getRunnables().add(nestedOp);
- }
-
- public boolean addRunnable(IRunnableWithProgress nestedOp) {
- return getRunnables().add(nestedOp);
- }
-
- protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- int size = fRunnables.size();
- monitor.beginTask("", size);//$NON-NLS-1$
- for (int i = 0; i < fRunnables.size(); i++) {
- IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- }
- }
-
- protected List getRunnables() {
- if (fRunnables == null)
- fRunnables = new ArrayList(3);
- return fRunnables;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.html b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.html
deleted file mode 100644
index fb8fe10..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>wtp operation api overview</title>
-</head>
-<body>
-<p>
- The WTP Wizard API allows clients to build wizards in conjunction with
- the WTP Operation Framework quickly and with minimal effort.
- </p>
-<table width="500">
-<tr>
-<td>
-<p>Under Construction.</p>
-</td>
-</tr>
-</table>
-<table cellpadding="10" cellspacing="10">
-<tr>
-<td>
-<p>
-<img src="escape_out_to_source_folder level/overview/your_image.jpg"></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>
-<i>Figure 1: Image description</i>
-</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.xml b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.xml
deleted file mode 100644
index e217a53..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../" />
- <title>wtp operation api overview</title>
- </head>
-
- <body>
- <abstract>
- The WTP Wizard API allows clients to build wizards in conjunction with
- the WTP Operation Framework quickly and with minimal effort.
- </abstract>
- <p>Under Construction.</p>
- <img src="escape_out_to_source_folder level/overview/your_image.jpg" caption="Image description" />
- </body>
-</html>
diff --git a/plugins/org.eclipse.wst.common.frameworks/.classpath b/plugins/org.eclipse.wst.common.frameworks/.classpath
deleted file mode 100644
index b9e915c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="src-non_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.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.frameworks/.cvsignore b/plugins/org.eclipse.wst.common.frameworks/.cvsignore
deleted file mode 100644
index 59285f6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-bin
-build.xml
-temp.folder
-common_core.jar
-common.jar
-common_coresrc.zip
-commonsrc.zip
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.frameworks/.options b/plugins/org.eclipse.wst.common.frameworks/.options
deleted file mode 100644
index 2eaab8a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.wtp.common/debug/logtrace=false
-org.eclipse.wtp.common/debug/logtracefile=false
-org.eclipse.wtp.common/debug/loglevel=WARNING
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/.project b/plugins/org.eclipse.wst.common.frameworks/.project
deleted file mode 100644
index 30f458a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.frameworks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a95066..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Mar 24 02:07:18 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
deleted file mode 100644
index 3e681c9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.frameworks; singleton:=true
-Bundle-Version: 1.1.102.qualifier
-Bundle-Activator: org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin
-Bundle-Vendor: %provider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.frameworks.datamodel,
- org.eclipse.wst.common.frameworks.datamodel.properties,
- org.eclipse.wst.common.frameworks.internal;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.activities;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.datamodel;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.enablement;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.enablement.nonui;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.operations;x-internal:=true,
- org.eclipse.wst.common.frameworks.internal.plugin;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.frameworks/about.html b/plugins/org.eclipse.wst.common.frameworks/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.frameworks/build.properties b/plugins/org.eclipse.wst.common.frameworks/build.properties
deleted file mode 100644
index 4701114..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/build.properties
+++ /dev/null
@@ -1,22 +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,\
- META-INF/,\
- plugin.properties,\
- about.html,\
- .
-jars.compile.order = .
-src.includes = schema/,\
- component.xml
-output.. = bin/
-source.. = src-non_workbench/,\
- src/
diff --git a/plugins/org.eclipse.wst.common.frameworks/component.xml b/plugins/org.eclipse.wst.common.frameworks/component.xml
deleted file mode 100644
index 761526a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/component.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.common.frameworks">
- <description url=""></description>
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.wst.common.frameworks" fragment="false"/>
- <plugin id="org.eclipse.wst.common.frameworks.ui" fragment="false"/>
- <plugin id="org.eclipse.wst.common.environment" fragment="false"/>
-
- <package name="org.eclipse.wst.common.environment">
- <type name="Choice" subclass="false" instantiate="false" />
- <type name="EnvironmentException" subclass="false" instantiate="false" />
- <type name="EnvironmentService" subclass="false" instantiate="false" />
- <type name="IEnvironment" implement="false" />
- <type name="ILog" implement="false" />
- <type name="IStatusHandler" implement="false" />
- <type name="NullStatusHandler" subclass="false" instantiate="false" />
- <type name="StatusException" subclass="false" instantiate="false" />
- </package>
-
- <package name="org.eclipse.wst.common.environment.uri">
- <type name="IURI" implement="false" />
- <type name="IURIFactory" implement="false" />
- <type name="IURIFilter" implement="false" />
- <type name="IURIScheme" implement="false" />
- <type name="IURIVisitor" implement="false" />
- <type name="SimpleURIFactory" subclass="false" instantiate="false" />
- <type name="URIException" subclass="false" instantiate="false" />
- </package>
-
- <package name="org.eclipse.wst.common.frameworks.datamodel"></package>
-</component>
diff --git a/plugins/org.eclipse.wst.common.frameworks/plugin.properties b/plugins/org.eclipse.wst.common.frameworks/plugin.properties
deleted file mode 100644
index d56d20d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-provider=Eclipse.org
-pluginName=Common Frameworks
-OperationExtension=OperationExtension
-Function_Extension_Group=Function Extension Group
-WTPActivityBridgeHelper=WTPActivityBridgeHelper
-DataModelProvider=DataModelProvider
diff --git a/plugins/org.eclipse.wst.common.frameworks/plugin.xml b/plugins/org.eclipse.wst.common.frameworks/plugin.xml
deleted file mode 100644
index 0ac2055..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="OperationExtension" name="%OperationExtension" schema="schema/OperationExtension.exsd"/>
- <extension-point id="functionGroup" name="%Function_Extension_Group" schema="schema/functionGroup.exsd"/>
- <extension-point id="WTPActivityBridgeHelper" name="%WTPActivityBridgeHelper" schema="schema/WTPActivityBridgeHelper.exsd"/>
- <extension-point id="DataModelProviderExtension" name="%DataModelProvider" schema="schema/DataModelProviderExtension.exsd"/>
-
- <extension
- id="context.Sensitive.Class.saveHandler"
- name="Save Handler - Headless Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="saveHandler"
- context="Headless"
- className="org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless">
- </uiContextSensitiveClass>
- </extension>
- <extension
- id="org.eclipse.wst.common.frameworks.internal.enablement"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="org.eclipse.wst.common.frameworks.internal.EnablementDetermination"
- context="Headless"
- className="org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager">
- </uiContextSensitiveClass>
- </extension>
- <extension
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="ISimpleValidateEditContext"
- className="org.eclipse.wst.common.frameworks.internal.SimpleValidateEditContextHeadless"
- context="Headless">
- </uiContextSensitiveClass>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.frameworks/prepareforpii.xml b/plugins/org.eclipse.wst.common.frameworks/prepareforpii.xml
deleted file mode 100644
index 638c7dc..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/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.common"/>
- <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}/src" >
- <fileset dir="${plugindir}/src">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
deleted file mode 100644
index 301984a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/DataModelProviderExtension.exsd
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="DataModelProviderExtension" name="Data Model Provider"/>
- </appInfo>
- <documentation>
- This can be used to extend an existing data model provider with a custom data model provider.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="DataModelProvider" minOccurs="0" maxOccurs="1"/>
- <element ref="ProviderDefinesType" minOccurs="0" maxOccurs="1"/>
- <element ref="ProviderImplementsType" minOccurs="0" maxOccurs="1"/>
- </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="DataModelProvider">
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier for the data model provider extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- required fully qualified classname of the data model provider to extend
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="ProviderDefinesType">
- <complexType>
- <attribute name="providerType" type="string" use="required">
- <annotation>
- <documentation>
- the type the data model provider defines
- </documentation>
- </annotation>
- </attribute>
- <attribute name="providerID" type="string" use="required">
- <annotation>
- <documentation>
- required identifier for the defined type
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="ProviderImplementsType">
- <complexType>
- <attribute name="providerType" type="string" use="required">
- <annotation>
- <documentation>
- fully qualified type the data model provider implements
- </documentation>
- </annotation>
- </attribute>
- <attribute name="providerID" type="string" use="required">
- <annotation>
- <documentation>
- required identifier for the implemented type
- </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.frameworks/schema/OperationExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
deleted file mode 100644
index d6f1ea2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="OperationExtension" name="Operation Extension"/>
- </appInfo>
- <documentation>
- This is the methodology for extending an existing operation by adding either a pre operation to be executed prior, or a post operation to be executed after the original operation.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="operationExtension"/>
- </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">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="operationExtension">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="preOperationClass" type="string">
- <annotation>
- <documentation>
- optional fully qualified name of the pre-operation class
- </documentation>
- </annotation>
- </attribute>
- <attribute name="postOperationClass" type="string">
- <annotation>
- <documentation>
- optional fully qualified name of the post-operation class
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- required id of the operation to extend
- </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.frameworks/schema/WTPActivityBridgeHelper.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
deleted file mode 100644
index 67d50e7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="WTPActivityBridgeHelper" name="WTP Activity Bridge Helper"/>
- </appInfo>
- <documentation>
- This is used to declare an activity bridge helper which is useful when enabling capabilities.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="WTPActivityBridgeHelper"/>
- </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="WTPActivityBridgeHelper">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- fully qualified class name for the WTPActivityBridgeHelper class
- </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.frameworks/schema/functionGroup.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
deleted file mode 100644
index 1809594..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="functionGroup" name="Function Extension Group"/>
- </appInfo>
- <documentation>
- A functionGroup provides a grouping of related function that can be contributed to the tools. For example, a third party component may want to contribute actions, editor pages, edit model resources, and many other functions specific to a given product. By associating all these functions with a group id, a mechanism is exposed for users to selectively enable and disable baskets of function. Extension points that allow for a "groupID" attribute generally will hide those functions when the group id is disabled.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="functionGroup" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="functionGroupPatternBinding" minOccurs="1" maxOccurs="unbounded"/>
- </choice>
- <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="functionGroup">
- <annotation>
- <documentation>
- Extension point definition for a group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="functionGroupID" type="string" use="required">
- <annotation>
- <documentation>
- A unique id for the group.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A human readable name.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
- A short description of the group.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- Optional path to an icon image.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="url" type="string">
- <annotation>
- <documentation>
- Optional url for the function group.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="priority" type="string" use="required">
- <annotation>
- <documentation>
- Ordering magnitude of plugins
- </documentation>
- </annotation>
- </attribute>
- <attribute name="initializerClassName" type="string" use="required">
- <annotation>
- <documentation>
- Class used to determine plugin enablement
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="functionGroupPatternBinding">
- <annotation>
- <documentation>
- This element allows one to bind function groups to patterns.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="functionGroupID" type="string" use="required">
- <annotation>
- <documentation>
- The unique identifier of the function group to bind.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pattern" type="string" use="required">
- <annotation>
- <documentation>
- The pattern to be bound. Patterns are regular expressions which match unique identifiers.
- </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.frameworks.functionGroup">
- <functionGroup
- name="Acme Co. Function Extension"
- functionGroupID="com.acme.acmepro"
- description="The AcmePro Extensions add integration to the Acme Web Server."
- enabledByDefault="true"
- icon="..."
- url="http://www.acme.com/"/>
- </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.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java
deleted file mode 100644
index d92bafd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java
+++ /dev/null
@@ -1,40 +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.frameworks.internal.enablement.nonui;
-
-/**
- * Common interface for ArchiveRuntime and ArchiveWrapped exceptions, which can contain nested
- * exceptions
- */
-public interface IWFTWrappedException {
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public String[] getAllMessages();
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public String getConcatenatedMessages();
-
- public Exception getInnerMostNestedException();
-
- public String getMessage();
-
- public java.lang.Exception getNestedException();
-
- public void printStackTrace();
-
- public void printStackTrace(java.io.PrintStream s);
-
- public void printStackTrace(java.io.PrintWriter s);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java
deleted file mode 100644
index 9a59c94..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java
+++ /dev/null
@@ -1,93 +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.frameworks.internal.enablement.nonui;
-
-//import com.ibm.etools.wft.nls.WFTUtilsResourceHandler;
-
-
-
-/**
- * Insert the type's description here. Creation date: (04/03/01 11:12:51 AM)
- *
- * @author: Administrator
- */
-public class WFTWrappedException extends java.lang.reflect.InvocationTargetException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -6885044277377784429L;
-
- /**
- * WFTWrappedException constructor comment.
- */
- protected WFTWrappedException() {
- super();
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- */
- public WFTWrappedException(Throwable target) {
- super(target);
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- * @param s
- * java.lang.String
- */
- public WFTWrappedException(Throwable target, String s) {
- super(target, s);
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (getTargetException() != null) {
- s.println(this);
- //TODO add this back in
- // s.println(WFTUtilsResourceHandler.getString("Stack_trace_of_nested_exce_ERROR_"));
- // //$NON-NLS-1$ = "Stack trace of nested exception:"
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (getTargetException() != null) {
- s.println(this);
- //TODO add this back in
- // s.println(WFTUtilsResourceHandler.getString("Stack_trace_of_nested_exce_ERROR_"));
- // //$NON-NLS-1$ = "Stack trace of nested exception:"
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
deleted file mode 100644
index 67cac79..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.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.frameworks.internal.enablement.nonui;
-
-public class WorkbenchUtil {
-
- protected static boolean WorkbenchRunning = false;
-
- private WorkbenchUtil() {
- super();
- }
-
- /**
- * workbenchIsRunning() - test whether or not we are running in the workbench environment.
- *
- * @see JavaPlugin.startup()
- */
- public static boolean workbenchIsRunning() {
- return WorkbenchRunning;
- }
-
- /**
- * Set to true if you are running in a Workbench environment.
- *
- * @see JavaPlugin.startup()
- */
- public static void setWorkbenchIsRunning(boolean aBoolean) {
- WorkbenchRunning = aBoolean;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelOperation.java
deleted file mode 100644
index 705b22a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelOperation.java
+++ /dev/null
@@ -1,188 +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.frameworks.datamodel;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-/**
- * <p>
- * Abstract implementation for an IDataModelOperation.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- *
- * @since 1.0
- */
-public abstract class AbstractDataModelOperation extends AbstractOperation implements IDataModelOperation {
-
- /**
- * <p>
- * Convenience IStatus.OK.
- * </p>
- */
- protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
-
- private String id;
- private IEnvironment environment;
-
- /**
- * <p>
- * The IDataModel used by this IDataModelOperation
- * </p>
- */
- protected IDataModel model;
-
- /**
- * <p>
- * Default constructor.
- * </p>
- */
- public AbstractDataModelOperation() {
- super(""); //$NON-NLS-1$
- this.id = getClass().getName();
- }
-
- /**
- * <p>
- * Constructor taking an IDataModel
- * </p>
- *
- * @param model
- * the IDataModel used to drive this operation
- */
- public AbstractDataModelOperation(IDataModel model) {
- super(""); //$NON-NLS-1$ // TODO add a label property to IDataModel???
- this.model = model;
- this.id = getClass().getName();
- }
-
- /**
- * <p>
- * Default implementation of setID().
- * <p>
- *
- * @see IDataModelOperation#setID(String)
- */
- public void setID(String id) {
- this.id = id;
- }
-
- /**
- * <p>
- * Default implementation of getID().
- * </p>
- *
- * @see IDataModelOperation#getID()
- */
- public String getID() {
- return id;
- }
-
- /**
- * <p>
- * Default implementation of setDataModel()
- * </p>
- *
- * @see IDataModelOperation#setDataModel(IDataModel)
- */
- public void setDataModel(IDataModel model) {
- this.model = model;
- }
-
- /**
- * <p>
- * Default implementation of getDataModel()
- * </p>
- *
- * @see IDataModelOperation#getDataModel()
- */
- public IDataModel getDataModel() {
- return model;
- }
-
- /**
- * <p>
- * Default implementation of getSchedulingRule() returns
- * <code>ResourcesPlugin.getWorkspace().getRoot()</code>.
- * </p>
- *
- * @see IDataModelOperation#getSchedulingRule()
- */
- public ISchedulingRule getSchedulingRule() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- /**
- * <p>
- * Default implementation of getOperationExecutionFlags() returns
- * <code>IWorkspace.AVOID_UPDATE</code>.
- * </p>
- *
- * @see IDataModelOperation#getOperationExecutionFlags()
- */
- public int getOperationExecutionFlags() {
- return IWorkspace.AVOID_UPDATE;
- }
-
- /**
- * <p>
- * The framework will set the environment on this operation before it is executed. The operation
- * can then use the environment to report status, log information, and access resources in an
- * environment neutral way.
- * </p>
- *
- * @param env
- * the environment.
- *
- */
- public final void setEnvironment(IEnvironment env) {
- environment = env;
- }
-
- /**
- * <p>
- * An operation can call this method to get the environment that has been set by the operations
- * framework.
- * </p>
- *
- * @return returns an environment.
- */
- public final IEnvironment getEnvironment() {
- return environment;
- }
-
- /**
- * <p>
- * Default empty implementation of redo.
- * </p>
- */
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
-
- /**
- * <p>
- * Default empty implementation of undo.
- * </p>
- */
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelProvider.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelProvider.java
deleted file mode 100644
index 57f3302..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/AbstractDataModelProvider.java
+++ /dev/null
@@ -1,327 +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.frameworks.datamodel;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * <p>
- * A default implementation of <code>IDataModelProvider</code>.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @since 1.0
- */
-public abstract class AbstractDataModelProvider implements IDataModelProvider {
-
- /**
- * <p>
- * The IDataModel for this provider.
- * </p>
- */
- protected IDataModel model = null;
-
- public Set getPropertyNames() {
- return new HashSet();
- }
-
- /**
- * <p>
- * A default implementation of init(). Subclasses should override as necessary.
- * </p>
- *
- * @see IDataModelProvider#init()
- */
- public void init() {
- }
-
- /**
- * </p>
- * An implemenation of setDataModel().
- * </p>
- *
- * @see IDataModelProvider#setDataModel(IDataModel)
- */
- public final void setDataModel(IDataModel dataModel) {
- this.model = dataModel;
- }
-
- /**
- * <p>
- * An implemenation of getDataModel().
- * </p>
- *
- * @see IDataModelProvider#getDataModel()
- */
- public final IDataModel getDataModel() {
- return model;
- }
-
-
- /**
- * </p>
- * A default impleneation of propertySet(). Subclasses should override as necessary.
- * </p>
- *
- * @param propertyName
- * the name of the property that has been set
- * @param propertyValue
- * the value the property has been set
- *
- * @see IDataModelProvider#propertySet(String, Object)
- */
- public boolean propertySet(String propertyName, Object propertyValue) {
- return true;
- }
-
- /**
- * <p>
- * A default implemenation of getDefaultProperty(). Subclasses should override as necessary.
- * </p>
- *
- * @param propertyName
- * the specified property
- *
- * @see IDataModelProvider#getDefaultProperty(String)
- */
- public Object getDefaultProperty(String propertyName) {
- if(ALLOW_EXTENSIONS.equals(propertyName)){
- return Boolean.TRUE;
- } else if(RESTRICT_EXTENSIONS.equals(propertyName)){
- return Collections.EMPTY_LIST;
- }
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of isPropertyEnabled(). Subclasses should override as necessary.
- * </p>
- *
- * @param propertyName
- * the specified property
- * @see IDataModelProvider#isPropertyEnabled(String)
- */
- public boolean isPropertyEnabled(String propertyName) {
- return true;
- }
-
- /**
- * <p>
- * A default implemenation of validate(). Subclasses should override as necessary.
- * </p>
- *
- * @param name
- * the name of the property or nested IDataModel being validated.
- *
- * @see IDataModelProvider#validate(String)
- */
- public IStatus validate(String name) {
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of getPropertyDescriptor(). Subclasses should override as necessary.
- * </p>
- *
- * @param propertyName
- * the specified property
- * @see IDataModelProvider#getPropertyDescriptor(String)
- */
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of getValidPropertyDescriptors(). Subclasses should override as
- * necessary.
- * </p>
- *
- * @param propertyName
- * the specified property
- * @see IDataModelProvider#getValidPropertyDescriptors(String)
- */
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of getExtendedContext(). Subclasses should override as necessary.
- * </p>
- *
- * @see IDataModelProvider#getExtendedContext()
- */
- public List getExtendedContext() {
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of getDefaultOperation(). Subclasses should override as necessary.
- * </p>
- *
- * @see IDataModelProvider#getDefaultOperation()
- */
- public IDataModelOperation getDefaultOperation() {
- return null;
- }
-
- /**
- * <p>
- * A default implemenation of getName(). Subclasses should override as necessary.
- * </p>
- *
- * @see IDataModelProvider#getID()
- */
- public String getID() {
- return this.getClass().getName();
- }
-
- /**
- * <p>
- * A default implemenation of dispose(). Subclasses should override as necessary.
- * </p>
- *
- * @see IDataModelProvider#dispose()
- */
- public void dispose() {
- }
-
- /**
- * <p>
- * Convenience method for getting a property from the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the property value
- *
- * @see IDataModel#getProperty(String)
- */
- protected final Object getProperty(String propertyName) {
- return model.getProperty(propertyName);
- }
-
- /**
- * <p>
- * Convenience method for setting a property on the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @param propertyValue
- * the property value
- *
- * @see IDataModel#setProperty(String, Object)
- */
- protected final void setProperty(String propertyName, Object propertyValue) {
- model.setProperty(propertyName, propertyValue);
- }
-
- /**
- * <p>
- * Convenience method for getting a boolean property from the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the boolean value of the property
- *
- * @see IDataModel#getBooleanProperty(String)
- */
- protected final boolean getBooleanProperty(String propertyName) {
- return model.getBooleanProperty(propertyName);
- }
-
- /**
- * <p>
- * Convenience method for setting a boolean property on the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @param propertyValue
- * the boolean property value
- *
- * @see IDataModel#setBooleanProperty(String, boolean)
- */
- protected final void setBooleanProperty(String propertyName, boolean propertyValue) {
- model.setBooleanProperty(propertyName, propertyValue);
- }
-
- /**
- * <p>
- * Convenience method for getting an int property from the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the int value of the property
- *
- * @see IDataModel#getIntProperty(String)
- */
- protected final int getIntProperty(String propertyName) {
- return model.getIntProperty(propertyName);
- }
-
- /**
- * <p>
- * Convenience method for setting an int property on the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @param propertyValue
- * the int property value
- *
- * @see IDataModel#setIntProperty(String, int)
- */
- protected final void setIntProperty(String propertyName, int propertyValue) {
- model.setIntProperty(propertyName, propertyValue);
- }
-
- /**
- * <p>
- * Convenience method for getting a String property from the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the String value of the property
- *
- * @see IDataModel#getStringProperty(String)
- */
- protected final String getStringProperty(String propertyName) {
- return model.getStringProperty(propertyName);
- }
-
- /**
- * <p>
- * Convenience method for checking if a property is set from the backing IDataModel.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return <code>true</code> if the property is set, <code>false</code> otherwise.
- */
- protected final boolean isPropertySet(String propertyName) {
- return model.isPropertySet(propertyName);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelEvent.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelEvent.java
deleted file mode 100644
index 402b0bc..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelEvent.java
+++ /dev/null
@@ -1,162 +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.frameworks.datamodel;
-
-/**
- * <p>
- * This event is used to communicate property changes from IDataModels to their IDataModelListeners.
- * </p>
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModel#addListener(IDataModelListener)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelListener
- *
- * @since 1.0
- */
-public final class DataModelEvent {
-
- /**
- * <p>
- * A flag used to specify the property's value has changed.
- * </p>
- *
- * @see IDataModel#getProperty(String)
- * @see #getFlag()
- */
- public static final int VALUE_CHG = 1;
-
- /**
- * Internal. Clients should not use.
- */
- static final int DEFAULT_CHG = 2;
-
- /**
- * <p>
- * A flag used to specify the property's enablment has changed.
- * </p>
- *
- * @see IDataModel#isPropertyEnabled(String)
- * @see #getFlag()
- */
- public static final int ENABLE_CHG = 3;
-
- /**
- * <p>
- * A flag used to specify the property's valid values have changed.
- * </p>
- *
- * @see IDataModel#getValidPropertyDescriptors(String)
- * @see #getFlag()
- */
- public static final int VALID_VALUES_CHG = 4;
-
-
- private IDataModel dataModel;
- private String propertyName;
- private int flag;
-
- /**
- * <p>
- * Constructor for DataModelEvent.
- * </p>
- *
- * @param dataModel
- * the IDataModel whose property has changed
- * @param propertyName
- * the name of the changed property
- * @param flag
- * contains a flag specifiying the event type
- */
- public DataModelEvent(IDataModel dataModel, String propertyName, int flag) {
- this.dataModel = dataModel;
- this.propertyName = propertyName;
- this.flag = flag;
- }
-
- /**
- * <p>
- * Returns the IDataModel whose property has changed.
- * </p>
- *
- * @return the IDataModel whose property has changed.
- */
- public IDataModel getDataModel() {
- return dataModel;
- }
-
- /**
- * <p>
- * Returns the name of the changed property.
- * </p>
- *
- * @return the name of the changed property.
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * <p>
- * Returns the flag indicating the event type. Valid types are:
- * <ul>
- * <li><code>PROPERTY_CHG</code></li>
- * <li><code>VALID_VALUES_CHG</code></li>
- * <li><code>ENABLE_CHG</code></li>
- * </ul>
- * </p>
- *
- * @return the flag indicating the event type.
- */
- public int getFlag() {
- return flag;
- }
-
- /**
- * <p>
- * Convenience method to return the IDataModel's property. This is equavalent to:
- * <code>getDataModel().getProperty(getPropertyName())</code>.
- * </p>
- *
- * @return the dataModel's property.
- * @see IDataModel#getProperty(String)
- */
- public Object getProperty() {
- return dataModel.getProperty(propertyName);
- }
-
- /**
- * <p>
- * Convenience method to return the IDataModel property's enablement state. This is equavalent
- * to: <code>getDataModel().isPropertyEnabled(getPropertyName())</code>.
- * </p>
- *
- * @return the dataModel property's enablement state.
- * @see IDataModel#isPropertyEnabled(String)
- */
- public boolean isPropertyEnabled() {
- return dataModel.isPropertyEnabled(propertyName);
- }
-
- /**
- * <p>
- * Convenience method to return the IDataModel property's valid property descriptors. This is
- * equavalent to: <code>getDataModel().getValidPropertyDescriptors(getPropertyName())</code>.
- * </p>
- *
- * @return the dataModel property's valid property descriptors.
- * @see IDataModel#getValidPropertyDescriptors(String)
- */
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors() {
- return dataModel.getValidPropertyDescriptors(propertyName);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java
deleted file mode 100644
index 5cb0732..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java
+++ /dev/null
@@ -1,135 +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.frameworks.datamodel;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelExtensionReader;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelImpl;
-
-/**
- * <p>
- * DataModelFactory is used to create IDataModel instances.
- * </p>
- *
- * @since 1.0
- */
-public class DataModelFactory {
-
- private static DataModelExtensionReader reader;
-
- private DataModelFactory() {
- }
-
- /**
- * <p>
- * Looks up the appropriate IDataModelProvider by the specified id and constructs a new
- * IDataModel. If the IDataModelProvider is not found then a RuntimeException is logged and null
- * is returned.
- * </p>
- *
- * @param dataModelProviderID
- * the id of the IDataModelProvider
- * @return a new IDataModel
- */
- public static IDataModel createDataModel(String dataModelProviderID) {
- IDataModelProvider provider = loadProvider(dataModelProviderID);
- if (provider == null)
- return null;
- return createDataModel(provider);
- }
-
- private static IDataModelProvider loadProvider(String id) {
- if (null == reader) {
- reader = new DataModelExtensionReader();
- }
- return reader.getProvider(id);
- }
-
- /**
- * <p>
- * Looks up the appropriate dataModelProviderIDs by the specified dataModelProviderKindID.
- * </p>
- *
- * @param dataModelProviderKindID
- * the String id of the dataModelProviderKindID
- *
- * @return the array of valid dataModelProviderIDs or an empty array if there are none.
- */
- public static String[] getDataModelProviderIDsForKind(String dataModelProviderKindID) {
- String[] validProviderIDs = loadProviderForProviderKind(dataModelProviderKindID);
- return null != validProviderIDs ? validProviderIDs : new String[0];
- }
-
-
- private static String[] loadProviderForProviderKind(String providerKind) {
- if (null == reader) {
- reader = new DataModelExtensionReader();
- }
- return reader.getProviderDescriptorsForProviderKind(providerKind);
- }
-
- /**
- * <p>
- * Builds an {@link IDataModel} using the specified Class. This Class will
- * normally be a sub interface of {@link IDataModelProperties}. If the
- * Class it is an {@link IDataModelProperties}.class then this method will
- * attempt to use the {@link IDataModelProperties#_provider_class} field to
- * load the {@link IDataModelProvider} with which to back the
- * {@link IDataModel}. If this fails, or if the Class is not an interface,
- * then this method is equavalent to
- * <code>createDataModel(aClass.getName())</code>.
- * </p>
- *
- * @param aClass
- * an {@link IDataModelProperties}.class or the class whose name
- * is the id of the IDataModelProvider
- * @return a new IDataModel
- */
- public static IDataModel createDataModel(Class aClass) {
- if(aClass.isInterface()){
- try{
- Class clazz = (Class)aClass.getField("_provider_class").get(null);
- if(clazz != null){
- IDataModelProvider provider = (IDataModelProvider)clazz.newInstance();
- return createDataModel(provider);
- }
- } catch (NoSuchFieldException e) {
- //ignore; the interface may not have defined the field and is relying on extensions.
- } catch (IllegalArgumentException e) {
- Logger.getLogger().logError(e);
- } catch (SecurityException e) {
- Logger.getLogger().logError(e);
- } catch (IllegalAccessException e) {
- Logger.getLogger().logError(e);
- } catch (InstantiationException e) {
- Logger.getLogger().logError(e);
- }
- }
- return createDataModel(aClass.getName());
- }
-
- /**
- * <p>
- * Creates a new IDataModel using the the specified instance of an IDataModelProvider.
- * </p>
- *
- * @param provider
- * @return a new IDataModel
- */
- public static IDataModel createDataModel(IDataModelProvider provider) {
- if (null == provider) {
- throw new NullPointerException();
- }
- DataModelImpl dataModel = new DataModelImpl(provider);
- return dataModel;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelPropertyDescriptor.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelPropertyDescriptor.java
deleted file mode 100644
index 2154ecc..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelPropertyDescriptor.java
+++ /dev/null
@@ -1,140 +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.frameworks.datamodel;
-
-/**
- * <p>
- * A DataModelPropertyDescriptor provides a human readible description for an IDataModel
- * propertyValue.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModel#getPropertyDescriptor(String)
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModel#getValidPropertyDescriptors(String)
- *
- * @since 1.0
- */
-public final class DataModelPropertyDescriptor {
-
- /**
- * <p>
- * A convenience method which returns an array of DataModelPropertyDescriptors. If
- * <code>values</code> is <code>null</code> then a 0 length array is returned. Otherwise for
- * each <code>values[i]</code> in the array, a new DataModelPropertyDescriptors is created
- * using <code>new DataModelPropertyDescriptors(values[i]);</code>.
- * </p>
- *
- * @param values
- * the array of property values
- * @return the constructed DataModelPropertyDescriptors array
- */
- public static DataModelPropertyDescriptor[] createDescriptors(Object[] values) {
- if (null == values) {
- return new DataModelPropertyDescriptor[0];
- }
- DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[values.length];
- for (int i = 0; i < descriptors.length; i++) {
- descriptors[i] = new DataModelPropertyDescriptor(values[i]);
- }
- return descriptors;
- }
-
- /**
- * <p>
- * A convenience method which returns an array of DataModelPropertyDescriptors. If
- * <code>values</code> is <code>null</code> then a 0 length array is returned. Otherwise for
- * each <code>values[i]</code> and <code>descriptions[i]</code> in the arrays, a new
- * DataModelPropertyDescriptor is created using
- * <code>new DataModelPropertyDescriptor(values[i], descriptions[i]);</code>. Both arrays
- * must be the same length.
- * </p>
- *
- * @param values
- * the array of property values
- * @param descriptions
- * the array of property descriptions cooresponding the values array
- * @return the constructed DataModelPropertyDescriptors array
- */
- public static DataModelPropertyDescriptor[] createDescriptors(Object[] values, String[] descriptions) {
- if (null == values) {
- return new DataModelPropertyDescriptor[0];
- }
- DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[values.length];
- for (int i = 0; i < descriptors.length; i++) {
- descriptors[i] = new DataModelPropertyDescriptor(values[i], descriptions[i]);
- }
- return descriptors;
-
- }
-
- private Object propertyValue;
- private String propertyDescription;
-
- /**
- * <p>
- * This is equavalent to calling <code>DataModelPropertyDescriptor(propertyValue, null)</code>.
- * </p>
- *
- * @param propertyValue
- * the propery value
- */
- public DataModelPropertyDescriptor(Object propertyValue) {
- this.propertyValue = propertyValue;
- }
-
- /**
- * <p>
- * Creates a new DataModelPropertyDescriptor with the specified propertyValue and
- * propertyDescription.
- * </p>
- *
- * @param propertyValue
- * the property value
- * @param propertyDescription
- * the human readible proeprty descriptionF
- */
- public DataModelPropertyDescriptor(Object propertyValue, String propertyDescription) {
- this.propertyValue = propertyValue;
- this.propertyDescription = propertyDescription;
- }
-
- /**
- * <p>
- * Returns the property value.
- * </p>
- *
- * @return the property value
- */
- public Object getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * <p>
- * Returns a human readible property description. If a non null description has been specified,
- * then it will be returned. Otherwise, the property value's <code>toString()</code> will be
- * returned if it is not null. Otherwise the empty String (<code>""</code>) will be
- * returned. <code>null</code> will never be returned.
- * </p>
- *
- * @return the human readible property description, never <code>null</code>
- */
- public String getPropertyDescription() {
- if (null != propertyDescription) {
- return propertyDescription;
- }
- String str = (null != propertyValue) ? propertyValue.toString() : null;
- return (null != str) ? str : ""; //$NON-NLS-1$
- }
-
- public String toString(){
- return getPropertyDescription();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModel.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModel.java
deleted file mode 100644
index fa31c67..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModel.java
+++ /dev/null
@@ -1,747 +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.frameworks.datamodel;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * <p>
- * IDataModels are the core piece of a framework used to simplify data collection, operation
- * execution, and Wizard generation.
- * </p>
- * <p>
- * IDataModels are primarily an intelligent mechanism for managing data. Each IDataModel tracks
- * specific Objects known as "properties". Each property may be set or get using its property name.
- * A Collection of property names for an IDataModel instance may be retreived using
- * <code>getAllProperties()</code>. In addition to getting/setting properties, IDataModels may
- * also provide default values for unset properties, human readable descriptors for properties,
- * enumerations of valid property values, validation for properties, and enablement for properties.
- * </p>
- * <p>
- * IDataModels may also be nested (and unnested) recursively within another. When one IDataModel is
- * nested within another, then client code may access all properties on the former through the
- * latter. This is especially useful when the same IDataModel (tracking the same properties) may be
- * used within the context of several different broader scenarios. Nesting may apply to any
- * IDataModel, and may be abitraryly deep (even cylical if you dare). Nesting offers flexibility,
- * especially for extension by 3rd party clients.
- * </p>
- * <p>
- * Each IDataModel may also supply an IDataModelOperation (a subclass of
- * org.eclipse.core.commands.operations.IUndoableOperation) for execution. When executed within the
- * IDataModel framework all these operations are inherently and abitrarily extendable.
- * </p>
- * <p>
- * Each IDataModel may also indirectly supply a DataModelWizard. This indirection is necessary to
- * spilt UI dependencies from the core IDataModel framework. DataModelWizards are also inherently
- * extendable.
- * </p>
- * <p>
- * IDataModels are not meant to be instantiated directly, rather they are built from an
- * IDataModelProvider. Clients wishing to define their own IDataModel must do so by implementing an
- * IDataModelProvider. Clients wishing to utilize an IDataModel must create it using the
- * DataModelFactory with the associated IDataModelProvider.
- * </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
- *
- * @since 1.0
- */
-public interface IDataModel {
-
- /**
- * <p>
- * Returns the unique ID which identifies this IDataModel instance. The same ID should be used
- * by the default operation (if any) for clients to extend or instantiate directly, the
- * DataModelWizard (if any) for clients to extend or instantiate directly.
- * </p>
- * <p>
- * Note, this is not the same as a hashcode. Multiple IDataModel instances created with the same
- * IDataModelProvider type will all have the same ID.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @see IDataModelProvider#getID()
- *
- * @return the unique ID for this IDataModel
- */
- public String getID();
-
- /**
- * <p>
- * Returns the default operation to execute against this IDataModel. The returned operation is
- * derived from the operation supplied by the backing IDataModelProvider. The returned type is
- * IDataModelManagerOperation which adds additional functionality to the returned
- * IDataModelOperation.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @see IDataModelProvider#getDefaultOperation()
- *
- * @return the default operation
- */
- public IDataModelOperation getDefaultOperation();
-
- /**
- * <p>
- * This method only pertains to IDataModels for extedended operations. The returned extended
- * context is used by the IDataModelOperation framework to determine whether a particular
- * extended operation should execute. The returned list is should contain Objects adaptable to
- * IProject. This IDataModel's function groups are looked up through the extension mechanism. If
- * a function group is defined, it is first checked for enablement. Then each adapted IProject
- * is inspected to verify it handles the function group. If all these conditions are met, then
- * the extended operation associated with this IDataModel is executed; otherwise it is skipped.
- * If no function group is defined, or no extended context is defined (i.e. this method returns
- * an empty list, or the objects in the returned list are not adaptable to IProject) then the
- * extended operation will execute (it will never be skipped).
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- * <p>
- * This method should not be called by clients.
- * </p>
- *
- * @return a List of Objects adaptable to IProject
- *
- * @see IDataModelProvider#getExtendedContext()
- */
- public List getExtendedContext();
-
- /**
- * <p>
- * Returns the property value for the specified propertyName.
- * </p>
- * <p>
- * If the specified propertyName is not a property then a RuntimeException will be thrown.
- * </p>
- * <p>
- * Before the property is returned, first the owning IDataModel must be located. If the
- * specified propertyName is a base property {@link #isBaseProperty(String)}, then this
- * IDataModel is the owner. Otherwise, a recursive search through the nested IDataModels is
- * conducted to locate the owning IDataModel. If more than one nested IDataModel defines the
- * property, then the first one located is considered the owning IDataModel.
- * </p>
- * <p>
- * Once the owning IDataModel is found the property is checked to see if it is set
- * {@link #isPropertySet(String)}. If the property is set, the set value is returned. If the
- * property is not set, its default is returned {@link #getDefaultProperty(String)}.
- * </p>
- * <p>
- * There are convenience methods for getting primitive <code>int</code> and
- * <code>boolean</code> types as well as Strings.
- * <ul>
- * <li>{@link #getIntProperty(String)}</li>
- * <li>{@link #getBooleanProperty(String)}</li>
- * <li>{@link #getStringProperty(String)}</li>
- * </ul>
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the property
- *
- * @see #setProperty(String, Object)
- * @see #getBooleanProperty(String)
- * @see #getIntProperty(String)
- * @see #getStringProperty(String)
- */
- public Object getProperty(String propertyName);
-
- /**
- * <p>
- * Returns the default property value for the specified propertyName.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @see IDataModelProvider#getDefaultProperty(String)
- */
- public Object getDefaultProperty(String propertyName);
-
- /**
- * <p>
- * A convenience method for getting ints. If the property is set then this method is equavalent
- * to:
- * </p>
- * <p>
- * <code>((Integer)getProperty(propertyName)).intValue();</code>
- * </p>
- * <p>
- * <code>-1</code> is returned if a call to getProperty(propertyName) returns
- * <code>null</code>.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the int value of the property
- * @see #setProperty(String, Object)
- * @see #setIntProperty(String, int)
- */
- public int getIntProperty(String propertyName);
-
- /**
- * <p>
- * A convenience method for getting booleans. If the property is set then this method is
- * equavalent to:
- * </p>
- * <p>
- * <code>((Boolean)getProperty(propertyName)).booleanValue();</code>
- * </p>
- * <p>
- * <code>false</code> is returned if a call to getProperty(propertyName) returns
- * <code>null</code>.
- * </p>
- *
- * @param propertyName
- * the property name
- * @return the boolean value of the property
- * @see #setProperty(String, Object)
- * @see #setBooleanProperty(String, boolean)
- */
- public boolean getBooleanProperty(String propertyName);
-
- /**
- * <p>
- * A convenience method for getting Strings. If the property is set then this method is
- * equavalent to:
- * </p>
- * <p>
- * <code>(String)getProperty(propertyName)</code>
- * </p>
- * <p>
- * <code>""</code> is returned if a call to getProperty(propertyName) returns
- * <code>null</code>.
- * </p>
- *
- * @param propertyName
- * @see #setProperty(String, Object)
- */
- public String getStringProperty(String propertyName);
-
- /**
- * <p>
- * Sets the specified propertyName to the specified propertyValue. Subsequent calls to
- * {@link #getProperty(String)} will return the same propertyValue.
- * </p>
- * <p>
- * When a propertyValue other than <code>null</code> is set, then the property is considered
- * "set" (see {@link #isPropertySet(String)}), conversly, a propertyValue of <code>null</code>
- * is considered "unset".
- * </p>
- * <p>
- * If the specified propertyName is not a property (see {@link #isProperty(String)}) then a
- * RuntimeException will be thrown.
- * </p>
- * <p>
- * There are convenience methods for setting primitive <code>int</code> and
- * <code>boolean</code> types as well as Strings.
- * <ul>
- * <li>{@link #setIntProperty(String, int)}</li>
- * <li>{@link #setBooleanProperty(String, boolean)}</li>
- * <li>{@link #setStringProperty(String, String)}</li>
- * </ul>
- * </p>
- * <p>
- * An IDataModel implementor may define additional post set logic in
- * {@link IDataModelProvider#propertySet(String, Object)}.
- * </p>
- *
- * @param propertyName
- * the name of the property to set
- * @param propertyValue
- * the value to set the property
- *
- *
- * @see #getProperty(String)
- * @see #isPropertySet(String)
- * @see #isProperty(String)
- * @see IDataModelProvider#propertySet(String, Object)
- */
- public void setProperty(String propertyName, Object propertyValue);
-
- /**
- * <p>
- * A convenience method for setting ints. This method is equavalent to:
- * <p>
- * <code>setProperty(propertyName, new Integer(propertyValue));</code>
- * </p>
- *
- * @param propertyName
- * the name of the property
- * @param propertyValue
- * the <code>int</code> value of the property
- * @see #setProperty(String, Object)
- * @see #getIntProperty(String)
- */
- public void setIntProperty(String propertyName, int propertyValue);
-
- /**
- * <p>
- * A convenience method for setting booleans. This method is equavalent to:
- * <p>
- * <code>setProperty(propertyName, (value) ? Boolean.TRUE : Boolean.FALSE);</code>
- * </p>
- *
- * @param propertyName
- * the name of the property
- * @param propertyValue
- * the <code>boolean</code> value of the property
- * @see #setProperty(String, Object)
- * @see #getBooleanProperty(String)
- */
- public void setBooleanProperty(String propertyName, boolean propertyValue);
-
- /**
- * <p>
- * A convenience method for setting Strings. This method is equavalent to:
- * <p>
- * <code>setProperty(propertyName, propertyValue);</code>
- * </p>
- *
- * @param propertyName
- * the name of the property
- * @param propertyValue
- * the value of the property
- * @see #setProperty(String, Object)
- * @see #getStringProperty(String)
- */
- public void setStringProperty(String propertyName, String propertyValue);
-
- /**
- * <p>
- * This method is used to nest the specified IDataModel within this IDataModel. The
- * <code>nestedModelName</code> argument should be a unique String to identify this particular
- * nested IDataModel. The same String is required when accessing the nested IDataModel using
- * either {@link #getNestedModel(String)} or {@link #removeNestedModel(String)}. If the
- * specified nested IDataModel has already been nested under this IDataModel or it is the same
- * instance as this IDataModel, then calling this method will have no effect.
- * </p>
- *
- * @param nestedModelName
- * the name of the IDataModel to be nested
- * @param dataModel
- * the IDataModel to be nested
- * @return <code>true</code> if the nesting was successful, <code>false</code> otherwise.
- *
- * @see #getNestedModel(String)
- * @see #removeNestedModel(String)
- */
- public boolean addNestedModel(String nestedModelName, IDataModel dataModel);
-
- /**
- * <p>
- * Remove the specified nestedModel.
- * </p>
- *
- * @param nestedModelName
- * the name of the nested IDataModel to remove.
- * @return the IDataModel removed, or <code>null</code> if the nested model does not exist or
- * if the specified name is null.
- */
- public IDataModel removeNestedModel(String nestedModelName);
-
- /**
- * <p>
- * Returns <code>true</code> if a nested model exists (at the top level only) with the
- * specified name and <code>false</code> otherwise.
- * </p>
- *
- * @param nestedModelName
- * the name of the nested IDataModel to check.
- * @return Returns <code>true</code> if a nested model exists (at the top level only) with the
- * specified name and <code>false</code> otherwise.
- */
- public boolean isNestedModel(String nestedModelName);
-
- /**
- * <p>
- * Returns the nested IDataModel identified the by the specified name. A RuntimeException is
- * thrown if there is no such nested IDataModel (i.e. isNestedModel() would return
- * <code>false</code>).
- * </p>
- *
- * @param nestedModelName
- * the name of the nested IDataModel to get.
- * @return the nested IDataModel
- */
- public IDataModel getNestedModel(String nestedModelName);
-
- /**
- * <p>
- * Returns a Collection of all nested IDataModels, or an empty Collection if none exist.
- * </p>
- *
- * @return a Collection of all nested IDataModels, or an empty Collection if none exist.
- */
- public Collection getNestedModels();
-
- /**
- * <p>
- * Returns a Collection of all nested IDataModels names, or an empty Collection if none exist.
- * </p>
- *
- * @return a Collection of all nested IDataModels names, or an empty Collection if none exist.
- */
- public Collection getNestedModelNames();
-
- /**
- * <p>
- * Returns a Collection of all nesting (the inverse of nested) IDataModels, or an empty
- * Collection if none exist.
- * </p>
- *
- * @return a Collection of all nesting (the inverse of nested) IDataModels, or an empty
- * Collection if none exist.
- */
- public Collection getNestingModels();
-
- /**
- * <p>
- * Returns a Collection of all base properties (not including nested properties), or an empty
- * Collection if none exist.
- * </p>
- *
- * @return a Collection of all base properties (not including nested properties), or an empty
- * Collection if none exist.
- */
- public Collection getBaseProperties();
-
- /**
- * <p>
- * Returns a Collection of all properties of recursively nested IDataModels, or an empty
- * Collection if none exist.
- * </p>
- *
- * @return a Collection of all properties of recursively nested IDataModels, or an empty
- * Collection if none exist.
- */
- public Collection getNestedProperties();
-
- /**
- * <p>
- * Returns a Collection of all properties (the union of getBaseProperties() and
- * getNestedProperties()), or an empty Collection if none exist.
- * </p>
- *
- * @return a Collection of all properties (the union of getBaseProperties() and
- * getNestedProperties()), or an empty Collection if none exist.
- */
- public Collection getAllProperties();
-
- /**
- * <p>
- * Returns <code>true</code> if the specified propertyName is a valid propertyName for this
- * root IDataModel only. Nested IDataModels are not checked, though it is possible for a nested
- * IDataModel to contain the same property.
- * </p>
- *
- * @param propertyName
- * the property name to check
- * @return <code>true</code> if this property is a base property, <code>false</code>
- * otherwise.
- *
- * @see #isProperty(String)
- * @see #isNestedProperty(String)
- */
- public boolean isBaseProperty(String propertyName);
-
- /**
- * <p>
- * Returns <code>true</code> if the specified propertyName is a valid propertyName for this
- * DataModel or any of its (recursively) nested IDataModels.
- * </p>
- *
- * @param propertyName
- * the property name to check
- * @return <code>true</code> if this is a property, <code>false</code> otherwise.
- *
- * @see #isBaseProperty(String)
- */
- public boolean isProperty(String propertyName);
-
- /**
- * <p>
- * Returns <code>true</code> if the specified propertyName is a valid propertyName for any of
- * its (recursively) nested IDataModels. The root IDataModel is not checked, though it is
- * possible for the root IDataModel to contain the same property.
- * </p>
- *
- * @param propertyName
- * the property name to check
- * @return <code>true</code> if the property is nested, <code>false</code> otherwise.
- * @see #isBaseProperty(String)
- */
- public boolean isNestedProperty(String propertyName);
-
- /**
- * <p>
- * Returns <code>true</code> if the specified property has been set on the IDataModel. If it
- * has not been set, then a call to get the same property will return the default value.
- * </p>
- *
- * @param propertyName
- * the property name to check
- * @return <code>true</code> if the property is set, <code>false</code> otherwise.
- */
- public boolean isPropertySet(String propertyName);
-
- /**
- * <p>
- * Returns <code>true</code> if the specified property is enabled and <code>false</code>
- * otherwise.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @see IDataModelProvider#isPropertyEnabled(String)
- *
- * @param propertyName
- * the property name to check
- * @return <code>true</code> if the specified property is enabled and <code>false</code>
- * otherwise.
- */
- public boolean isPropertyEnabled(String propertyName);
-
- /**
- * <p>
- * Returns <code>false</code> if the the IStatus returned by validateProperty(String) is ERROR
- * and <code>true</code> otherwise.
- * </p>
- *
- * @param propertyName
- * the property name to check
- * @return <code>false</code> if the the IStatus returned by validateProperty(String) is ERROR
- * and <code>true</code> otherwise.
- */
- public boolean isPropertyValid(String propertyName);
-
- /**
- * <p>
- * Returns an IStatus for the specified property. Retuns an IStatus.OK if the returned value is
- * valid with respect itself, other properites, and broader context of the IDataModel.
- * IStatus.ERROR is returned if the returned value is invalid. IStatus.WARNING may also be
- * returned if the value is not optimal.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @see IDataModelProvider#validate(String)
- */
- public IStatus validateProperty(String propertyName);
-
- /**
- * <p>
- * Returns <code>false</code> if the IStatus returned by validate(true) is ERROR and
- * <code>true</code> otherwise.
- * </p>
- *
- * @return <code>false</code> if the IStatus returned by validate(true) is ERROR and
- * <code>true</code> otherwise.
- */
- public boolean isValid();
-
- /**
- * <p>
- * Equavalent to calling <code>validate(true)</code>.
- * </p>
- *
- * @return an IStatus
- */
- public IStatus validate();
-
- /**
- * <p>
- * Iterates over all base properties and nested models IDs and calls validate(String). This
- * method returns when any call to validate(String) returns an IStatus error and
- * stopAtFirstFailure is set to true.
- * <p>
- *
- * @param stopAtFirstFailure
- * whether validation should stop at the first failure
- * @return an IStatus
- */
- public IStatus validate(boolean stopAtFirstFailure);
-
-
-
- /**
- * <p>
- * Returns a DataModelPropertyDescriptor for the specified property. The
- * <code>getPropertyValue()</code> method on the returned DataModelPropertyDescriptor will be
- * the same value as returned by <code>getPropertyValue(propertyName)</code>.
- * </p>
- * <p>
- * Following the example introduced in {@link #getValidPropertyDescriptors(String)}, suppose
- * the <code>SHIRT_SIZE</code> property is currently set to 1. A call to this method would
- * return a DataModelPropertyDescriptor whose <code>getPropertyValue()</code> returns
- * <code>1</code> and whose <code>getPropertyDescription()</code> returns <code>small</code>.
- * </p>
- * <p>
- * Also, note that even if a particular property is not confined to a finite set of values as
- * defined by {@link #getValidPropertyDescriptors(String)}this method will always return a
- * valid DataModelPropertyDescriptor.
- * </p>
- *
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @param propertyName
- * @return the DataModelPropertyDescriptor for the specified property
- *
- * @see #getValidPropertyDescriptors(String)
- */
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName);
-
- /**
- * <p>
- * Returns a DataModelPropertyDescriptor array consisting of all valid
- * DataModelPropertyDescriptors for the specified property. Each
- * {@link DataModelPropertyDescriptor} contains a value and a human readible description for the
- * value. The set of all values in the returned array are those values which are valid for the
- * IDataModel. This value set only makes sense when valid property values conform to a well
- * defined finite set. If no such value set exists for the property, then a 0 length array is
- * returned. <code>null</code> is never returned.
- * </p>
- * <p>
- * As an example, suppose there is a property called <code>SHIRT_SIZE</code> which is an
- * <code>Integer</code> type. Also suppse that valid shirt sizes are only small, medium, or
- * large. However, the actual values representing small, medium, and large are 1, 2, and 3
- * respectively. A call to <code>getValidPropertyDescriptors(SHIRT_SIZE)</code> would return a
- * DataModelPropertyDescriptor array where the value, description pairs would be {(1, small),
- * (2, medium), (3, large)}.
- * </p>
- * <p>
- * An IDataModel implementor defines this in IDataModelProvider.
- * </p>
- *
- * @param propertyName
- * then name of the property to check
- * @return the array of valid DataModelPropertyDescriptors
- * @see #getPropertyDescriptor(String)
- */
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName);
-
- /**
- * <p>
- * Adds the specified IDataModelListener to listen for DataModelEvents. If the specified
- * listener has already been added, calling this method will have no effect.
- * </p>
- *
- * @param dataModelListener
- * the new listener to add.
- *
- * @see #removeListener(IDataModelListener)
- */
- public void addListener(IDataModelListener dataModelListener);
-
- /**
- * <p>
- * Remove the specified IDataModelListener. If the specified listener is not a registered
- * listenr on this IDataModel, then calling this method will have no effect.
- * </p>
- *
- * @param dataModelListener
- * the listener to remove.
- * @see #addListener(IDataModelListener)
- */
- public void removeListener(IDataModelListener dataModelListener);
-
- /**
- * <p>
- * A constant used for notification.
- * </p>
- *
- * @see DataModelEvent#VALUE_CHG
- * @see #notifyPropertyChange(String, int)
- */
- public static final int VALUE_CHG = DataModelEvent.VALUE_CHG;
- /**
- * <p>
- * A constant used for notification. This contant is different from the others because it does
- * not map to an event type on DataModelEvent. When notifying with this type, a check is first
- * done to see whether the property is set. If the property is <empf>NOT</emph> set, then a
- * <code>VALUE_CHG</code> is fired, otherwise nothing happens.
- * </p>
- *
- * @see #notifyPropertyChange(String, int)
- */
- public static final int DEFAULT_CHG = DataModelEvent.DEFAULT_CHG;
- /**
- * <p>
- * A constant used for notification.
- * </p>
- *
- * @see DataModelEvent#ENABLE_CHG
- * @see #notifyPropertyChange(String, int)
- */
- public static final int ENABLE_CHG = DataModelEvent.ENABLE_CHG;
- /**
- * <p>
- * A constant used for notification.
- * </p>
- *
- * @see DataModelEvent#VALID_VALUES_CHG
- * @see #notifyPropertyChange(String, int)
- */
- public static final int VALID_VALUES_CHG = DataModelEvent.VALID_VALUES_CHG;
-
- /**
- * <p>
- * Notify all listeners of a property change. <code>eventType</code> specifies the type of
- * change. Acceptible values for eventType are <code>VALUE_CHG</code>,
- * <code>DEFAULT_CHG</code>, <code>ENABLE_CHG</code>, <code>VALID_VALUES_CHG</code>. If
- * the eventType is <code>DEFAULT_CHG</code> and the specified property is set, then this
- * method will do nothing.
- * </p>
- * <p>
- * Typically this method should only be invoked by an IDataModelProvider from its propertySet
- * implementation.
- * </p>
- *
- * @param propertyName
- * the name of the property changing
- * @param eventType
- * the type of event to fire
- *
- * @see #VALUE_CHG
- * @see #DEFAULT_CHG
- * @see #ENABLE_CHG
- * @see #VALID_VALUES_CHG
- * @see DataModelEvent
- */
- public void notifyPropertyChange(String propertyName, int eventType);
-
- /**
- * <p>
- * A typical dispose method used to clean up any resources not handled by general garbage
- * collection.
- * </p>
- *
- */
- public void dispose();
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelListener.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelListener.java
deleted file mode 100644
index d50aa4a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelListener.java
+++ /dev/null
@@ -1,34 +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.frameworks.datamodel;
-
-/**
- * <p>
- * The interface required when listening for DataModelEvents from an IDataModel.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModel#addListener(IDataModelListener)
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelEvent
- *
- * @since 1.0
- */
-public interface IDataModelListener {
-
- /**
- * <p>
- * Sent when DataModelEvents occur.
- * </p>
- *
- * @param event
- * the DataModelEvent
- */
- public void propertyChanged(DataModelEvent event);
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelOperation.java
deleted file mode 100644
index de532a9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelOperation.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.datamodel;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-/**
- * <p>
- * IDataModelOperation defines an IDataModel driven undoable operation. Every IDataModelOperation
- * may be extended by third party clients using the extended operation framework.
- * </p>
- *
- * <p>
- * This interface is not intended to be implemented by clients. Clients should subclass
- * {@link AbstractDataModelOperation}.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModel
- *
- * @since 1.0
- */
-public interface IDataModelOperation extends IUndoableOperation {
-
- /**
- * <p>
- * Sets the unique operation id. Typically, clients should not invoke this method.
- * </p>
- *
- * @param id
- * the unique operation id
- */
- public void setID(String id);
-
- /**
- * <p>
- * Returns the unique operation id.
- * </p>
- *
- * @return the unique operation id
- */
- public String getID();
-
- /**
- * <p>
- * Sets the IDataModel for this operation.
- * </p>
- *
- * @param model
- * the IDataModel used to run this operation
- */
- public void setDataModel(IDataModel model);
-
- /**
- * <p>
- * Returns this operation's IDataModel.
- * </p>
- *
- * @return this operation's IDataModel.
- */
- public IDataModel getDataModel();
-
- /**
- * <p>
- * Returns the ISchedulingRule used for executing this job using
- * {@link org.eclipse.core.resources.IWorkspace#run(org.eclipse.core.resources.IWorkspaceRunnable, ISchedulingRule, int, org.eclipse.core.runtime.IProgressMonitor)}.
- * If <code>null</code> is returned, then IWorkspace.getRoot() is used as the ISchedulingRule
- * during execution.
- * </p>
- *
- * @return the ISchedulingRule
- *
- * @see #getOperationExecutionFlags()
- * @see org.eclipse.core.resources.IWorkspace#run(org.eclipse.core.resources.IWorkspaceRunnable, ISchedulingRule, int,
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public ISchedulingRule getSchedulingRule();
-
- /**
- * <p>
- * Returns the OperationExecutionFlags used for executing this Operation as a workspace job.
- * {@link org.eclipse.core.resources.IWorkspace#run(org.eclipse.core.resources.IWorkspaceRunnable, ISchedulingRule, int, org.eclipse.core.runtime.IProgressMonitor)}.
- * </p>
- *
- * @return the OperationExecutionFlags
- *
- * @see #getSchedulingRule()
- * @seeorg.eclipse.core.resources.IWorkspace#run(org.eclipse.core.resources.IWorkspaceRunnable, ISchedulingRule, int,
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public int getOperationExecutionFlags();
-
- /**
- * <p>
- * The framework will set the environment on this operation before it is executed. The operation
- * can then use the environment to report status, log information, and access resources in an
- * environment neutral way.
- * <p>
- *
- * @param environment
- * the IEnvironment to set.
- */
- public void setEnvironment(IEnvironment environment);
-
- /**
- * Returns the IEvironment set in {@link #setEnvironment(IEnvironment)}}
- *
- * @return the set IEnvironment
- *
- * @see #setEnvironment(IEnvironment)
- */
- public IEnvironment getEnvironment();
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProperties.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProperties.java
deleted file mode 100644
index f9be08e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProperties.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.datamodel;
-
-/**
- * <p>
- * IDataModelProperties provides the base interface for all Data Model
- * Properties interfaces. Sub interface classes (e.g.
- * <code>some.company.IFooDataModelProperties.class</code>) should be used to
- * create instances of IDataModels using the
- * {@link DataModelFactory#createDataModel(Class)} method. In order for this
- * mechanism to work, the backing {@link IDataModelProvider} class must be
- * registerd to support the sub IDataModelProperties interface in one of two
- * ways. This registration should be performed by the model developer.
- * </p>
- * <p>
- * The first way to register the correct {@link IDataModelProvider} class is for
- * the interface to define a public static Class _provider_class field
- * which is set to the {@link IDataModelProvider} class, e.g.
- * </p>
- * <p>
- * <code>public static final Class _provider_class = some.company.FooDataModelProvider.class</code>
- * </p>
- * The above mechanism is recommended whenever the {@link IDataModelProperties} and
- * {@link IDataModelProvider} classes are both defined in the same plugin scope.
- * A second mechanism using the DataModelProviderExtension extension point is
- * available when the {@link IDataModelProvider} class is definend outside the
- * {@link IDataModelProperties} plugin scope.
- *
- * <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
- *
- * @since 1.0
- */
-public interface IDataModelProperties {
-
- /**
- * A boolean property defaults to Boolean.TRUE. If this is set to Boolean.FALSE no extended
- * operations will be executed.
- */
- public static final String ALLOW_EXTENSIONS = "IDataModelProperties.ALLOW_EXTENSIONS"; //$NON-NLS-1$
-
- /**
- * A List containing String objects, defautls to an empty List. If this list contains elements
- * and ALLOW_EXTENSIONS is set to Boolean.TRUE, then only extended operations not identified in
- * this list will be executed. These strings should either be the operation id or the fully
- * qualified operation class name.
- */
- public static final String RESTRICT_EXTENSIONS = "IDataModelProperties.RESTRICT_EXTENSIONS"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProvider.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProvider.java
deleted file mode 100644
index c6abfd9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/IDataModelProvider.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.datamodel;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-/**
- * IDataModelProviders are used by the DataMdoelFactory to construct IDataModels.
- *
- * <p>
- * This interface is not intended to be implemented by clients. Clients should subclass
- * {@link AbstractDataModelProvider}.
- * </p>
- *
- * @since 1.0
- */
-public interface IDataModelProvider extends IDataModelProperties {
-
- public static IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.common.frameworks.internal", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
-
- public void setDataModel(IDataModel dataModel);
-
- /**
- * <p>
- * Returns the backing IDataModel for this provider.
- * </p>
- *
- * @return the backing IDataModel
- */
- public IDataModel getDataModel();
-
- /**
- * <p>
- * Returns a list of property names for which this provider is responsible. This method is
- * called only once during initialization.
- * </p>
- *
- * @return the array of valid property names.
- */
- public Set getPropertyNames();
-
- /**
- * <p>
- * Providers should perform additional initialization here.
- * </p>
- */
- public void init();
-
- /**
- * <p>
- * This is where the provider should define how default properties should be computed.
- * </p>
- *
- * @param propertyName
- * the specified property
- * @return the default property value
- */
- public Object getDefaultProperty(String propertyName);
-
-
- /**
- * <p>
- * This is where the provider should define how property enablements are computed.
- * </p>
- *
- * @param propertyName
- * the specified property
- * @return <code>true</code> if the property is enabled, <code>false</code> otherwise.
- */
- public boolean isPropertyEnabled(String propertyName);
-
- /**
- * IDataModelProviders should perform property validation here. All calls to
- * IDataModel.validateProperty(String) are routed to the appropriate IDatModelProvider. When
- * IDataModel.validate() or IDataModel.validate(boolean) are called to validate the entire
- * IDataModel, any nested model names are also passed through to the IDataModelProvider for a
- * chance to validate the nested IDataModel in an appropriate manner.
- *
- * @param name
- * @return an IStatus
- */
- public IStatus validate(String name);
-
- /**
- * <p>
- * This is a special callback hook for the IDataModel provider to be notified of a setProperty()
- * call invoked on the backing IDataModel. This method is called after the actual value has been
- * stored by the IDataModel but before any general notifications are fired to its listeners.
- * Thus this IDataModelProvider may react to updates apropriately by setting other properties,
- * notifying default changes, notifying valid value changes, etc.
- * </p>
- *
- * @param propertyName
- * @param propertyValue
- * @return <code>true</code> to fire a VALUE_CHG DataModelEvent.
- */
- public boolean propertySet(String propertyName, Object propertyValue);
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName);
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName);
-
- public List getExtendedContext();
-
- public IDataModelOperation getDefaultOperation();
-
- public String getID();
-
- public void dispose();
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/package.xml b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/package.xml
deleted file mode 100644
index 855e7a4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../" />
- <title>Component creation and Referenced Component api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes API for Data Model Provider framework for builing executable
- and undoable operations using data models, their providers and provider interfaces that
- contain the properties used by the providers to set and retrieve these propertiese.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/properties/package.xml b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/properties/package.xml
deleted file mode 100644
index caaf774..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>Component creation and Referenced Component api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes API that defines the propeties that can be set on a flexible
- project datamodel to drive the the wizard and operations.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java
deleted file mode 100644
index d4069c5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java
+++ /dev/null
@@ -1,55 +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 12, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.enablement.FunctionGroupRegistry;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-
-
-/**
- * @author schacher
- *
- * Common superclass for enablement-aware (e.g., using function groups or activiities) extension
- * points.
- */
-public abstract class AbstractRegistryDescriptor extends ConfigurationElementWrapper implements Identifiable {
-
- protected Integer priority;
-
- public AbstractRegistryDescriptor(IConfigurationElement anElement) {
- super(anElement);
- }
-
- public IEnablementIdentifier getEnablementIdentifier(IProject project) {
- return IEnablementManager.INSTANCE.getIdentifier(getID(), project);
- }
-
- public abstract String getID();
-
- public int getPriority() {
- if (priority == null)
- priority = new Integer(FunctionGroupRegistry.getInstance().getFunctionPriority(getID()));
- return priority.intValue();
- }
-
- public boolean isEnabled(IProject p) {
- IEnablementIdentifier id = getEnablementIdentifier(p);
- return id.isEnabled();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java
deleted file mode 100644
index 9e8a19d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author mdelder
- *
- */
-public class AdaptabilityUtility {
-
-
- public static Object getAdapter(Object element, Class adapter) {
- if (element == null)
- return null;
- else if (element instanceof IAdaptable)
- return ((IAdaptable) element).getAdapter(adapter);
- else
- return Platform.getAdapterManager().getAdapter(element, adapter);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java
deleted file mode 100644
index 1f3572a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java
+++ /dev/null
@@ -1,69 +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 Oct 20, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ConfigurationElementWrapper {
-
- protected IConfigurationElement element;
-
- /**
- *
- */
- public ConfigurationElementWrapper(IConfigurationElement element) {
- super();
- this.element = element;
- }
-
-
-
- /**
- * @return Returns the element.
- */
- protected IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * Return the plugin id of the configuration element
- *
- * @return
- */
- public String getPluginId() {
- String pluginId = null;
-
- if (element != null) {
- IExtension extension = element.getDeclaringExtension();
-
- if (extension != null) {
- pluginId = extension.getNamespace();
- // TODO jsholl is this correct???
- }
- }
-
- return pluginId;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/DoNotUseMeThisWillBeDeletedPost15.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/DoNotUseMeThisWillBeDeletedPost15.java
deleted file mode 100644
index 6073321..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/DoNotUseMeThisWillBeDeletedPost15.java
+++ /dev/null
@@ -1,38 +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.frameworks.internal;
-
-/**
- * Other things to delete:
- *
- * The wtpuiAction extension point and schema in org.eclipse.wst.common.frameworks.ui
- */
-
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface/method/field
- *
- * @deprecated
- *
- */
-
-/**
- * This interface is being used to track code slated for removal. Any class or interface
- * implementing or extending this interface respectively should not be used. All such classes and
- * interfaces have been deprecated and are no longer supported and will be deleted post WTP 1.5.
- *
- * Any method or field with javadoc referencing this interface should not be used and will be
- * deleted post WTP 1.5
- *
- * @deprecated
- */
-public interface DoNotUseMeThisWillBeDeletedPost15 {
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java
deleted file mode 100644
index 517d65b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java
+++ /dev/null
@@ -1,65 +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.common.frameworks.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utility class to factor common code for implementers of IArchiveWrappedException
- */
-public class ExceptionHelper {
- /**
- * Utility class; cannot be instantiated
- */
- private ExceptionHelper() {
- super();
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost
- */
- public static java.lang.String[] getAllMessages(IWrappedException exception) {
- List messages = new ArrayList(4);
- messages.add(exception.getMessage());
- Exception nested = exception.getNestedException();
- while (nested != null) {
- messages.add(nested.getMessage());
- if (nested instanceof IWrappedException)
- nested = ((IWrappedException) nested).getNestedException();
- else
- nested = null;
- }
- return (String[]) messages.toArray(new String[messages.size()]);
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost, concatenated as
- * one
- */
- public static String getConcatenatedMessages(IWrappedException exception) {
- String[] messages = getAllMessages(exception);
- StringBuffer sb = new StringBuffer(256);
- for (int i = 0; i < messages.length; i++) {
- sb.append(messages[i]);
- if (i < messages.length - 1)
- sb.append('\n');
- }
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/HashUtil.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/HashUtil.java
deleted file mode 100644
index f2da27a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/HashUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal;
-
-public class HashUtil {
-
- public static int SEED = 11;
- private static int MULTI = 31;
-
- public static int hash(int seed, int i){
- return seed * MULTI + i;
- }
-
- public static int hash(int seed, Object obj){
- return hash(seed, null != obj ? obj.hashCode() : SEED);
- }
-
- public static int hash(int seed, boolean b){
- return hash(seed, b ? 1 : SEED);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java
deleted file mode 100644
index f67ce31..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java
+++ /dev/null
@@ -1,28 +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.common.frameworks.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Defines the API for coping with attempts to overwrite read-only files or save failures
- */
-public interface ISaveHandler {
- public void access();
-
- public void handleSaveFailed(SaveFailedException ex, IProgressMonitor monitor);
-
- public void release();
-
- public boolean shouldContinueAndMakeFileEditable(IFile aFile);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISimpleValidateEditContext.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISimpleValidateEditContext.java
deleted file mode 100644
index 5b21d8e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISimpleValidateEditContext.java
+++ /dev/null
@@ -1,22 +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.common.frameworks.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-
-public interface ISimpleValidateEditContext {
-
- public static final String CLASS_KEY = "ISimpleValidateEditContext"; //$NON-NLS-1$
-
- public IStatus validateEdit(IFile [] files);
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.java
deleted file mode 100644
index 7b3f3ae..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.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.common.frameworks.internal;
-
-/**
- * Common interface for ArchiveRuntime and ArchiveWrapped exceptions, which can contain nested
- * exceptions
- */
-public interface IWrappedException {
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public String[] getAllMessages();
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public String getConcatenatedMessages();
-
- public Exception getInnerMostNestedException();
-
- public String getMessage();
-
- public java.lang.Exception getNestedException();
-
- public void printStackTrace();
-
- public void printStackTrace(java.io.PrintStream s);
-
- public void printStackTrace(java.io.PrintWriter s);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java
deleted file mode 100644
index d8756a9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java
+++ /dev/null
@@ -1,59 +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 Nov 21, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class Messages {
- //Resource bundle.
- protected ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public Messages() {
- initializeBundle();
- }
-
- protected abstract void initializeBundle();
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- protected String doGetResourceString(String key) {
- try {
- return (resourceBundle != null ? resourceBundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- protected String doGetResourceString(String key, Object[] args) {
- String pattern = doGetResourceString(key);
- if (pattern != null)
- return MessageFormat.format(pattern, args);
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java
deleted file mode 100644
index 7763509..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java
+++ /dev/null
@@ -1,63 +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.common.frameworks.internal;
-
-/**
- * Runtime exception that could get thrown during save of an edit model; clients should use
- * {@link #getConcatenatedMessages}to get all the messages of this and all nested exceptions to
- * report the failure.
- */
-public class SaveFailedException extends WrappedRuntimeException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -4640018901910731240L;
-
- /**
- * SaveFailedException constructor comment.
- */
- public SaveFailedException() {
- super();
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param e
- * java.lang.Exception
- */
- public SaveFailedException(Exception e) {
- super(e);
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param s
- * java.lang.String
- */
- public SaveFailedException(String s) {
- super(s);
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param s
- * java.lang.String
- * @param e
- * java.lang.Exception
- */
- public SaveFailedException(String s, Exception e) {
- super(s, e);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java
deleted file mode 100644
index a9c07ce..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java
+++ /dev/null
@@ -1,86 +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.common.frameworks.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.IWFTWrappedException;
-
-/**
- * Insert the type's description here. Creation date: (10/19/2001 11:40:59 AM)
- *
- * @author: Administrator
- */
-public class SaveHandlerHeadless implements ISaveHandler {
- /**
- * HeadlessSaveHandler constructor comment.
- */
- public SaveHandlerHeadless() {
- super();
- }
-
- /**
- * access method comment.
- */
- public void access() {
- }
-
- /**
- * handleSaveFailed method comment.
- */
- public void handleSaveFailed(SaveFailedException ex, org.eclipse.core.runtime.IProgressMonitor monitor) {
- throw ex;
- }
-
- public static boolean isFailedWriteFileFailure(IWFTWrappedException ex) {
- Exception nested = ex.getInnerMostNestedException();
- if (nested == null)
- return false;
-
- return isFailedWriteFileFailure(nested);
- }
-
- public static boolean isFailedWriteFileFailure(Exception ex) {
- if (ex instanceof IWFTWrappedException)
- return isFailedWriteFileFailure((IWFTWrappedException) ex);
- else if (ex instanceof CoreException)
- return isFailedWriteFileFailure((CoreException) ex);
- return false;
- }
-
- public static boolean isFailedWriteFileFailure(CoreException ex) {
- org.eclipse.core.runtime.IStatus status = ex.getStatus();
- if (status == null)
- return false;
- Throwable nested = status.getException();
- if (nested instanceof CoreException)
- return isFailedWriteFileFailure((CoreException) nested);
- return status.getCode() == org.eclipse.core.resources.IResourceStatus.FAILED_WRITE_LOCAL;
- }
-
- /**
- * release method comment.
- */
- public void release() {
- }
-
- /**
- * shouldContinueAndMakeFileEditable method comment.
- */
- public boolean shouldContinueAndMakeFileEditable(org.eclipse.core.resources.IFile aFile) {
- if (aFile == null)
- return false;
- String error = WTPResourceHandler.getString("Unable_to_save_read-only_f_ERROR_", new Object[]{aFile.getFullPath()}); //$NON-NLS-1$ = "Unable to save read-only file: "
- Logger.getLogger().logError(error);
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java
deleted file mode 100644
index 7dee26d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java
+++ /dev/null
@@ -1,34 +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.frameworks.internal;
-
-import org.eclipse.jem.util.UIContextDetermination;
-
-
-/**
- * A registry for the default ISaveHandler to use when saving edit models
- */
-public class SaveHandlerRegister {
- private static ISaveHandler saveHandler;
-
- /**
- * This is a utility class and should not be instantiated
- */
- protected SaveHandlerRegister() {
- super();
- }
-
- public static ISaveHandler getSaveHandler() {
- if (saveHandler == null)
- saveHandler = (ISaveHandler) UIContextDetermination.createInstance("saveHandler"); //$NON-NLS-1$
- return saveHandler;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEdit.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEdit.java
deleted file mode 100644
index cd27da2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEdit.java
+++ /dev/null
@@ -1,39 +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.common.frameworks.internal;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jem.util.UIContextDetermination;
-
-public class SimpleValidateEdit {
-
- /**
- * @param files must contain only {@link IFile}s
- * @return
- */
- public static boolean validateEdit(List files){
- if(files == null || files.size() == 0){
- return true;
- }
- return validateEdit( (IFile [])files.toArray(new IFile[files.size()]));
- }
-
- public static boolean validateEdit(IFile[] files) {
- if(files == null || files.length == 0){
- return true;
- }
- ISimpleValidateEditContext validator = (ISimpleValidateEditContext) UIContextDetermination.createInstance(ISimpleValidateEditContext.CLASS_KEY);
- return validator.validateEdit(files).isOK();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEditContextHeadless.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEditContextHeadless.java
deleted file mode 100644
index eb8fe65..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SimpleValidateEditContextHeadless.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.common.frameworks.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class SimpleValidateEditContextHeadless implements ISimpleValidateEditContext {
-
- public IStatus validateEdit(IFile[] files) {
- final List filesList = new ArrayList();
- for(int i=0;i<files.length; i++){
- if(files[i].exists() && files[i].isReadOnly()){
- filesList.add(files[i]);
- }
- }
- if(filesList.size() > 0){
- IFile [] filesToValidate = (IFile [])filesList.toArray(new IFile[filesList.size()]);
- return validateEditImpl(filesToValidate);
- }
- return IDataModelProvider.OK_STATUS;
- }
-
- protected IStatus validateEditImpl(IFile[] filesToValidate) {
- return ResourcesPlugin.getWorkspace().validateEdit(filesToValidate, null);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java
deleted file mode 100644
index e33fdf6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java
+++ /dev/null
@@ -1,77 +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 10, 2003
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.DefaultPluginTraceRenderer;
-import org.eclipse.jem.util.logger.proxyrender.IMsgLogger;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WorkbenchUtil;
-import org.osgi.framework.BundleContext;
-
-public abstract class WTPPlugin extends Plugin implements IMsgLogger {
- protected static Logger logger = null;
- protected static WTPPlugin instance = null;
- public ResourceBundle resourceBundle;
-
- /**
- * @param descriptor
- */
- public WTPPlugin() {
- super();
- instance = this;
- }
-
- public Logger getMsgLogger() {
- if (logger == null) {
- logger = Logger.getLogger(getPluginID());
- setRenderer(logger);
- }
- return logger;
- }
-
- /**
- * @param aLogger
- */
- protected void setRenderer(Logger aLogger) {
- new DefaultPluginTraceRenderer(aLogger);
- }
-
- public Logger getLogger() {
- return getMsgLogger();
- }
- public static boolean isPlatformCaseSensitive() {
- return Platform.OS_MACOSX.equals(Platform.getOS()) ? false : new
- java.io.File("a").compareTo(new java.io.File("A")) != 0; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- public abstract String getPluginID();
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- WorkbenchUtil.setWorkbenchIsRunning(true);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
deleted file mode 100644
index cc583e0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
+++ /dev/null
@@ -1,155 +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 Nov 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPProjectUtilities {
-
- /**
- * Adds a old nauture to a project, FIRST, this is used to make project backward compatible
- */
- public static void addOldNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
-
- //check if the old nature does not exist
- boolean addNature = true;
- for (int i = 0; i < prevNatures.length; i++) {
- String nature = prevNatures[i];
- if (nature.equals(natureId)) {
- addNature = false;
- break;
- }
- }
- if (addNature) {
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 1, prevNatures.length);
- newNatures[0] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, IResource.AVOID_NATURE_CONFIG, null);
- }
- }
-
- /**
- * Adds a nature in the project in the index specified
- */
- public static void addOldNatureToProject(IProject proj, String natureId, int index) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
-
- //check if the old nature does not exist
- boolean addNature = true;
- for (int i = 0; i < prevNatures.length; i++) {
- String nature = prevNatures[i];
- if (nature.equals(natureId)) {
- addNature = false;
- break;
- }
- }
- if (addNature) {
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, index);
-
- newNatures[index] = natureId;
- System.arraycopy(prevNatures, index, newNatures, index + 1, prevNatures.length - index);
- description.setNatureIds(newNatures);
- proj.setDescription(description, IResource.AVOID_NATURE_CONFIG, null);
- }
- }
-
- /**
- * Adds a nauture to a project, FIRST
- */
- 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);
- }
-
- /**
- * Adds a nature to a project, LAST
- */
- 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 a nature from the project
- */
- 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;
- }
- newNatures[newsize++] = prevNatures[i];
- }
- if (!matchfound)
- throw new CoreException(new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, "The nature id " + natureId + " does not exist on the project " + project.getName(), null)); //$NON-NLS-1$ //$NON-NLS-2$
- String[] temp = newNatures;
- newNatures = new String[newsize];
- System.arraycopy(temp, 0, newNatures, 0, newsize);
- description.setNatureIds(newNatures);
- project.setDescription(description, null);
- }
-
- 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);
-
- return result;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java
deleted file mode 100644
index 6d82d66..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java
+++ /dev/null
@@ -1,71 +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.common.frameworks.internal;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Administrator
- *
- *
- */
-public class WTPResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("wtp_common"); //$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(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$
- }
- }
- 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);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java
deleted file mode 100644
index cd2aba8..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java
+++ /dev/null
@@ -1,81 +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.common.frameworks.internal;
-
-public class WrappedException extends java.lang.reflect.InvocationTargetException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -9221925581603648538L;
-
- /**
- * WFTWrappedException constructor comment.
- */
- protected WrappedException() {
- super();
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- */
- public WrappedException(Throwable target) {
- super(target);
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- * @param s
- * java.lang.String
- */
- public WrappedException(Throwable target, String s) {
- super(target, s);
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (getTargetException() != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (getTargetException() != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java
deleted file mode 100644
index 351de84..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java
+++ /dev/null
@@ -1,124 +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.common.frameworks.internal;
-
-public class WrappedRuntimeException extends RuntimeException implements IWrappedException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 2684637746275620101L;
- /** The exception which necessitated this runtime exception, if one exists */
- protected Exception nestedException;
-
- public WrappedRuntimeException() {
- super();
- }
-
- public WrappedRuntimeException(Exception e) {
- super();
- setNestedException(e);
- }
-
- public WrappedRuntimeException(String s) {
- super(s);
- }
-
- public WrappedRuntimeException(String s, Exception e) {
- super(s);
- setNestedException(e);
- }
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public java.lang.String[] getAllMessages() {
- return ExceptionHelper.getAllMessages(this);
- }
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public java.lang.String getConcatenatedMessages() {
- return ExceptionHelper.getConcatenatedMessages(this);
- }
-
- /**
- * getInnerMostNestedException method comment.
- */
- public java.lang.Exception getInnerMostNestedException() {
- Exception n = getNestedException();
- if (n == null)
- return this;
- else if (n instanceof IWrappedException)
- return ((IWrappedException) n).getInnerMostNestedException();
- else
- return n;
- }
-
- /**
- * @return java.lang.Exception
- */
- public java.lang.Exception getNestedException() {
- return nestedException;
- }
-
- /**
- * Added to provide compatibility for the Java 1.4.2 addition of
- * <code>Throwable.getCause()</code>.
- * @return The nested exception held by the receiver.
- */
- public java.lang.Throwable getCause() {
- return getNestedException();
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (nestedException != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- nestedException.printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (nestedException != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- nestedException.printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * @param newNestedException
- * java.lang.Exception
- */
- public void setNestedException(java.lang.Exception newNestedException) {
- nestedException = newNestedException;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java
deleted file mode 100644
index 3538ea4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java
+++ /dev/null
@@ -1,106 +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 4, 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.frameworks.internal.activities;
-
-import java.util.Collections;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPActivityBridge {
- private static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks"; //$NON-NLS-1$
- private static final String EXTENSION_POINT = "WTPActivityBridgeHelper"; //$NON-NLS-1$
- private static final String LISTENER_CLASS = "class"; //$NON-NLS-1$
-
- private static WTPActivityBridge INSTANCE = null;
- private WTPActivityBridgeHelper[] listeners;
-
- public static WTPActivityBridge getInstance() {
- if (null == INSTANCE) {
- INSTANCE = new WTPActivityBridge();
- }
- return INSTANCE;
- }
-
- private WTPActivityBridge() {
- loadExtensionPoints();
- }
-
- public void enableActivity(String activityID, boolean enabled) {
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].enableActivity(activityID, enabled);
- }
- }
-
- public Set getEnabledActivityIds() {
- for (int i = 0; i < listeners.length; i++) {
- return listeners[i].getEnabledActivityIds();
- }
- return Collections.EMPTY_SET;
- }
-
- public void setEnabledActivityIds(Set activityIDs) {
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].setEnabledActivityIds(activityIDs);
- }
- }
-
- public Set getActivityIDsFromContribution(String localID, String pluginID) {
- for (int i = 0; i < listeners.length; i++) {
- return listeners[i].getActivityIDsFromContribution(localID, pluginID);
- }
- return Collections.EMPTY_SET;
- }
-
- private void loadExtensionPoints() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, EXTENSION_POINT);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- listeners = new WTPActivityBridgeHelper[elements.length];
- for (int i = 0; i < elements.length; i++) {
- if (null == elements[i].getAttribute(LISTENER_CLASS)) {
- logError(elements[i], "No " + LISTENER_CLASS + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- }
- try {
- listeners[i] = (WTPActivityBridgeHelper) elements[i].createExecutableExtension(LISTENER_CLASS);
- } catch (CoreException e) {
- logError(elements[i], "Error loading " + LISTENER_CLASS + ":" + elements[i].getAttribute(LISTENER_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
- e.printStackTrace();
- }
- }
- }
-
- 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());
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java
deleted file mode 100644
index 4378df1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 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.frameworks.internal.activities;
-
-import java.util.Set;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public interface WTPActivityBridgeHelper {
-
- public void enableActivity(String activityID, boolean enabled);
-
- public Set getEnabledActivityIds();
-
- public void setEnabledActivityIds(Set activityIDs);
-
- public Set getActivityIDsFromContribution(String localID, String pluginID);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelExtensionReader.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelExtensionReader.java
deleted file mode 100644
index 86adbc6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelExtensionReader.java
+++ /dev/null
@@ -1,165 +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.frameworks.internal.datamodel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-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.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class DataModelExtensionReader extends RegistryReader {
-
- private static final String EXTENSION = "DataModelProviderExtension"; //$NON-NLS-1$
-
- private static final String PROVIDER_ELEMENT = "DataModelProvider"; //$NON-NLS-1$
- private static final String DEFINES_TYPE_ELEMENT = "ProviderDefinesType"; //$NON-NLS-1$
- private static final String IMPLEMENTS_TYPE_ELEMENT = "ProviderImplementsType"; //$NON-NLS-1$
-
- private static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
- private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
- private static final String ATTRIBUTE_PROVIDER_TYPE = "providerType"; //$NON-NLS-1$
- private static final String ATTRIBUTE_PROVIDER_ID = "providerID"; //$NON-NLS-1$
-// private static final String ATTRIBUTE_FG = "functionGroupID"; //$NON-NLS-1$
-
- private HashMap providerExtensions;
- private HashMap definesExtensions;
- private HashMap implementsExtensions;
-
- private boolean hasInitialized = false;
-
- public DataModelExtensionReader() {
- super(WTPCommonPlugin.PLUGIN_ID, EXTENSION);
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals(PROVIDER_ELEMENT)) {
- String id = element.getAttribute(ATTRIBUTE_ID);
- if (null == id || id.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + PROVIDER_ELEMENT + " is missing " + ATTRIBUTE_ID)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- String className = element.getAttribute(ATTRIBUTE_CLASS);
- if (null == className || className.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + PROVIDER_ELEMENT + " is missing " + ATTRIBUTE_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- addProviderExtension(id, element);
- } else if (element.getName().equals(DEFINES_TYPE_ELEMENT)) {
- String type = element.getAttribute(ATTRIBUTE_PROVIDER_TYPE);
- if (null == type || type.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + DEFINES_TYPE_ELEMENT + " is missing " + ATTRIBUTE_PROVIDER_TYPE)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- String id = element.getAttribute(ATTRIBUTE_PROVIDER_ID);
- if (null == id || id.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + DEFINES_TYPE_ELEMENT + " is missing " + ATTRIBUTE_PROVIDER_ID)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- addDefinesExtension(type, id);
- } else if (element.getName().equals(IMPLEMENTS_TYPE_ELEMENT)) {
- String type = element.getAttribute(ATTRIBUTE_PROVIDER_TYPE);
- if (null == type || type.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + DEFINES_TYPE_ELEMENT + " is missing " + ATTRIBUTE_PROVIDER_TYPE)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- String id = element.getAttribute(ATTRIBUTE_PROVIDER_ID);
- if (null == id || id.trim().length() == 0) {
- Logger.getLogger().logError(new RuntimeException("Extension:" + EXTENSION + " Element:" + DEFINES_TYPE_ELEMENT + " is missing " + ATTRIBUTE_PROVIDER_ID)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- addImplementsExtension(type, id);
- }
- return true;
- }
-
- private void addProviderExtension(String id, IConfigurationElement element) {
- if (providerExtensions.containsKey(id)) {
- Logger.getLogger().logError(new RuntimeException("Duplicate " + PROVIDER_ELEMENT + " " + ATTRIBUTE_ID + " " + id)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- providerExtensions.put(id, element);
- }
-
- private void addDefinesExtension(String type, String id) {
- if (definesExtensions.containsKey(type)) {
- Logger.getLogger().logError(new RuntimeException("Duplicate " + PROVIDER_ELEMENT + " " + ATTRIBUTE_PROVIDER_TYPE + " " + type)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- definesExtensions.put(type, id);
- }
-
- private void addImplementsExtension(String type, String id) {
- List cache;
- if (implementsExtensions.containsKey(type))
- cache = (List) implementsExtensions.get(type);
- else
- cache = new ArrayList();
- cache.add(id);
- implementsExtensions.put(type, cache);
- }
-
- protected IConfigurationElement getProviderExtension(String id) {
- readRegistryIfNecessary();
- IConfigurationElement element = (IConfigurationElement) providerExtensions.get(id);
- if (null == element) {
- Logger.getLogger().log(new RuntimeException("Extension:" + EXTENSION + " Element:" + PROVIDER_ELEMENT + " not found for " + ATTRIBUTE_ID + ": " + id)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- return element;
- }
-
- protected String getDefinesExtension(String providerType) {
- readRegistryIfNecessary();
- String element = (String) definesExtensions.get(providerType);
- if (null == element) {
- Logger.getLogger().log(new RuntimeException("Extension:" + EXTENSION + " Element:" + DEFINES_TYPE_ELEMENT + " not found for " + ATTRIBUTE_PROVIDER_TYPE + ": " + providerType)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- return element;
- }
-
- public String[] getProviderDescriptorsForProviderKind(String providerType) {
- readRegistryIfNecessary();
- List providerList = new ArrayList();
- providerList.add(getDefinesExtension(providerType));
- if (implementsExtensions.containsKey(providerType)) {
- List implementsIds = (List) implementsExtensions.get(providerType);
- if (implementsIds != null && !implementsIds.isEmpty()) {
- providerList.addAll(implementsIds);
- }
- }
- String[] providerArray = new String[providerList.size()];
- for (int i = 0; i < providerArray.length; i++) {
- providerArray[i] = (String) providerList.get(i);
- }
- return providerArray;
- }
-
- private void readRegistryIfNecessary() {
- if (!hasInitialized) {
- providerExtensions = new HashMap();
- definesExtensions = new HashMap();
- implementsExtensions = new HashMap();
- readRegistry();
- hasInitialized = true;
- }
- }
-
- public IDataModelProvider getProvider(String id) {
- IDataModelProvider provider = null;
- IConfigurationElement element = getProviderExtension(id);
- if (element == null)
- return null;
- try {
- provider = (IDataModelProvider) element.createExecutableExtension(ATTRIBUTE_CLASS);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return provider;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelImpl.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelImpl.java
deleted file mode 100644
index 7a4dc3a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelImpl.java
+++ /dev/null
@@ -1,468 +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.frameworks.internal.datamodel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-
-public final class DataModelImpl implements IDataModel, IDataModelListener {
-
- private static final String PROPERTY_NOT_LOCATED_ = WTPResourceHandler.getString("20"); //$NON-NLS-1$
- private static final String NESTED_MODEL_NOT_LOCATED = WTPResourceHandler.getString("21"); //$NON-NLS-1$
-
- private static final DataModelPropertyDescriptor[] NO_DESCRIPTORS = new DataModelPropertyDescriptor[0];
-
- private Collection basePropertyNames;
- private Collection allPropertyNames;
- private Collection nestedPropertyNames; // lazily initialzed when nested models added
- private Map propertyValues = new Hashtable();
- private Map nestedModels;
- private Set nestingModels;
- private List listeners;
-
- private IDataModelProvider provider;
-
- public DataModelImpl(IDataModelProvider dataModelProvider) {
- init(dataModelProvider);
- }
-
- private void init(IDataModelProvider dataModelProvider) {
- this.provider = dataModelProvider;
- dataModelProvider.setDataModel(this);
- Collection propertyNames = dataModelProvider.getPropertyNames();
- HashSet properties = new HashSet();
- properties.addAll(propertyNames);
-
- properties.add(IDataModelProperties.ALLOW_EXTENSIONS);
- properties.add(IDataModelProperties.RESTRICT_EXTENSIONS);
- basePropertyNames = Collections.unmodifiableCollection(properties);
- allPropertyNames = new HashSet();
- allPropertyNames.addAll(basePropertyNames);
- dataModelProvider.init();
- }
-
- public boolean isBaseProperty(String propertyName) {
- return basePropertyNames.contains(propertyName);
- }
-
- public Collection getBaseProperties() {
- return Collections.unmodifiableCollection(basePropertyNames);
- }
-
- public boolean isProperty(String propertyName) {
- return allPropertyNames.contains(propertyName);
- }
-
- public Collection getAllProperties() {
- return Collections.unmodifiableCollection(allPropertyNames);
- }
-
- public boolean isNestedProperty(String propertyName) {
- return null != nestedPropertyNames && nestedPropertyNames.contains(propertyName);
- }
-
- public Collection getNestedProperties() {
- return Collections.unmodifiableCollection(nestedPropertyNames);
- }
-
- private void checkValidPropertyName(String propertyName) {
- if (!isProperty(propertyName)) {
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
- }
-
- private DataModelImpl getOwningDataModel(String propertyName) {
- checkValidPropertyName(propertyName);
- return searchNestedModels(propertyName);
- }
-
- private DataModelImpl searchNestedModels(String propertyName) {
- if (isBaseProperty(propertyName)) {
- return this;
- } else if (nestedModels != null) {
- DataModelImpl dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (DataModelImpl) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.searchNestedModels(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- public Object getProperty(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- if (dataModel.propertyValues.containsKey(propertyName)) {
- return dataModel.propertyValues.get(propertyName);
- }
- return dataModel.provider.getDefaultProperty(propertyName);
- }
-
- public Object getDefaultProperty(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- return dataModel.provider.getDefaultProperty(propertyName);
- }
-
- public int getIntProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return -1;
- return ((Integer) prop).intValue();
- }
-
- public boolean getBooleanProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return false;
- return ((Boolean) prop).booleanValue();
- }
-
- public String getStringProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return ""; //$NON-NLS-1$
- return (String) prop;
- }
-
- public boolean isPropertySet(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- return dataModel.propertyValues.containsKey(propertyName);
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- return dataModel.provider.isPropertyEnabled(propertyName);
- }
-
-
- public void setProperty(String propertyName, Object propertyValue) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- dataModel.internalSetProperty(propertyName, propertyValue);
- }
-
- private void internalSetProperty(String propertyName, Object propertyValue) {
- Object oldValue = propertyValues.get(propertyName);
- if (valueChanged(propertyValue, oldValue)) {
- if (null != propertyValue)
- propertyValues.put(propertyName, propertyValue);
- else if (propertyValues.containsKey(propertyName))
- propertyValues.remove(propertyName);
- if (provider.propertySet(propertyName, propertyValue)) {
- notifyPropertyChange(propertyName, DataModelEvent.VALUE_CHG);
- }
- }
- }
-
- private boolean valueChanged(Object o1, Object o2) {
- return o1 != o2 && ((o1 != null && !o1.equals(o2)) || !o2.equals(o1));
- }
-
- public void setIntProperty(String propertyName, int value) {
- setProperty(propertyName, new Integer(value));
- }
-
- public void setBooleanProperty(String propertyName, boolean value) {
- setProperty(propertyName, (value) ? Boolean.TRUE : Boolean.FALSE);
- }
-
- public void setStringProperty(String propertyName, String value) {
- setProperty(propertyName, value);
- }
-
- public boolean addNestedModel(String modelName, IDataModel dataModel) {
- if (this == dataModel) {
- return false;
- }
- if (null == nestedModels) {
- nestedModels = new Hashtable();
- nestedPropertyNames = new HashSet();
- }
- DataModelImpl nestedDataModel = (DataModelImpl) dataModel;
- if (null == nestedDataModel.nestingModels) {
- nestedDataModel.nestingModels = new HashSet();
- }
- if (nestedDataModel.nestingModels.contains(this)) {
- return false;
- }
- nestedDataModel.nestingModels.add(this);
-
- nestedModels.put(modelName, nestedDataModel);
-
- addNestedProperties(nestedDataModel.allPropertyNames);
- nestedDataModel.addListener(this);
- return true;
- }
-
- private void addNestedProperties(Collection nestedProperties) {
- boolean propertiesAdded = allPropertyNames.addAll(nestedProperties);
- propertiesAdded = nestedPropertyNames.addAll(nestedProperties) || propertiesAdded;
- // Pass the new properties up the nesting chain
- if (propertiesAdded && nestingModels != null) {
- Iterator iterator = nestingModels.iterator();
- while (iterator.hasNext()) {
- ((DataModelImpl) iterator.next()).addNestedProperties(nestedProperties);
- }
- }
- }
-
- public Collection getNestedModels() {
- return nestedModels != null ? Collections.unmodifiableCollection(nestedModels.values()) : Collections.EMPTY_SET;
- }
-
- public Collection getNestedModelNames() {
- return nestedModels != null ? Collections.unmodifiableCollection(nestedModels.keySet()) : Collections.EMPTY_SET;
- }
-
- public Collection getNestingModels() {
- return nestingModels != null ? Collections.unmodifiableCollection(nestingModels) : Collections.EMPTY_SET;
- }
-
- public IDataModel removeNestedModel(String modelName) {
- if (!isNestedModel(modelName)) {
- return null;
- }
- DataModelImpl model = (DataModelImpl) nestedModels.remove(modelName);
- model.nestingModels.remove(this);
- removeNestedProperties(model.allPropertyNames);
- model.removeListener(this);
- if (nestedModels.isEmpty()) {
- nestedModels = null;
- }
- return model;
- }
-
- private void removeNestedProperties(Collection nestedProperties) {
- Iterator iterator = nestedProperties.iterator();
- String property = null;
- boolean keepProperty = false;
- Set nestedPropertiesToRemove = null;
- while (iterator.hasNext()) {
- keepProperty = false;
- property = (String) iterator.next();
- if (basePropertyNames.contains(property)) {
- keepProperty = true;
- }
- if (!keepProperty && nestedModels != null) {
- Iterator nestedModelsIterator = nestedModels.values().iterator();
- while (!keepProperty && nestedModelsIterator.hasNext()) {
- DataModelImpl nestedModel = (DataModelImpl) nestedModelsIterator.next();
- if (nestedModel.isProperty(property)) {
- keepProperty = true;
- }
- }
- }
- if (!keepProperty) {
- if (null == nestedPropertiesToRemove) {
- nestedPropertiesToRemove = new HashSet();
- }
- nestedPropertiesToRemove.add(property);
- }
- }
-
- if (null != nestedPropertiesToRemove) {
- allPropertyNames.removeAll(nestedPropertiesToRemove);
- nestedPropertyNames.removeAll(nestedPropertiesToRemove);
- if (nestingModels != null) {
- Iterator nestingModelsIterator = nestingModels.iterator();
- while (nestingModelsIterator.hasNext()) {
- ((DataModelImpl) nestingModelsIterator.next()).removeNestedProperties(nestedPropertiesToRemove);
- }
- }
- }
- }
-
- public boolean isNestedModel(String modelName) {
- return modelName != null && null != nestedModels && nestedModels.containsKey(modelName);
- }
-
- public IDataModel getNestedModel(String modelName) {
- IDataModel dataModel = (null != nestedModels && null != modelName) ? (IDataModel) nestedModels.get(modelName) : null;
- if (null == dataModel) {
- throw new RuntimeException(NESTED_MODEL_NOT_LOCATED + modelName);
- }
- return dataModel;
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- DataModelPropertyDescriptor[] descriptors = dataModel.provider.getValidPropertyDescriptors(propertyName);
- return descriptors == null ? NO_DESCRIPTORS : descriptors;
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- DataModelPropertyDescriptor descriptor = dataModel.provider.getPropertyDescriptor(propertyName);
- return descriptor == null ? new DataModelPropertyDescriptor(getProperty(propertyName)) : descriptor;
- }
-
- public void notifyPropertyChange(String propertyName, int flag) {
- if (flag == DEFAULT_CHG) {
- if (isPropertySet(propertyName)) {
- return;
- }
- flag = VALUE_CHG;
- }
- notifyListeners(new DataModelEvent(this, propertyName, flag));
- }
-
- private void notifyListeners(DataModelEvent event) {
- if (listeners != null && !listeners.isEmpty()) {
- IDataModelListener listener;
- for (int i = 0; i < listeners.size(); i++) {
- listener = (IDataModelListener) listeners.get(i);
- if (listener != event.getDataModel()) {
- listener.propertyChanged(event);
- }
- }
- }
- }
-
- public void propertyChanged(DataModelEvent event) {
- notifyListeners(event);
- }
-
- public IStatus validate() {
- return validate(true);
- }
-
- public IStatus validate(boolean stopOnFirstFailure) {
- IStatus status = null;
- IStatus propStatus;
- String propName;
- Iterator it;
- for (int i = 0; i < 2; i++) {
- switch (i) {
- case 0 :
- it = basePropertyNames.iterator();
- break;
- case 1 :
- default :
- it = getNestedModelNames().iterator();
- }
- while (it.hasNext()) {
- propName = (String) it.next();
- propStatus = provider.validate(propName);
- if (propStatus != null) {
- if (status == null || status.isOK())
- status = propStatus;
- else {
- if (status.isMultiStatus())
- ((MultiStatus) status).merge(propStatus);
- else {
- MultiStatus multi = new MultiStatus("org.eclipse.wst.common.frameworks.internal", 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$
- multi.merge(status);
- multi.merge(propStatus);
- status = multi;
- }
- }
- if (stopOnFirstFailure && status != null && !status.isOK() && status.getSeverity() == IStatus.ERROR)
- return status;
- }
- }
- }
-
- if (status == null)
- return IDataModelProvider.OK_STATUS;
- return status;
- }
-
- public void addListener(IDataModelListener listener) {
- if (listener != null) {
- if (listeners == null) {
- listeners = new ArrayList();
- listeners.add(listener);
- } else if (!listeners.contains(listener))
- listeners.add(listener);
- }
- }
-
- public void removeListener(IDataModelListener listener) {
- if (listeners != null && listener != null)
- listeners.remove(listener);
- }
-
- /**
- * Return true if the model doesn't have any errors.
- *
- * @return boolean
- */
- public boolean isValid() {
- return validate(true).getSeverity() != IStatus.ERROR;
- }
-
- public boolean isPropertyValid(String propertyName) {
- return validateProperty(propertyName).getSeverity() != IStatus.ERROR;
- }
-
- public IStatus validateProperty(String propertyName) {
- DataModelImpl dataModel = getOwningDataModel(propertyName);
- IStatus status = dataModel.provider.validate(propertyName);
- return status == null ? IDataModelProvider.OK_STATUS : status;
- }
-
- public List getExtendedContext() {
- List extendedContext = provider.getExtendedContext();
- return extendedContext == null ? Collections.EMPTY_LIST : extendedContext;
- }
-
- public void dispose() {
- provider.dispose();
- }
-
- public IDataModelOperation getRawOperation() {
- IDataModelOperation providerOp = provider.getDefaultOperation();
- if (null == providerOp) {
- providerOp = new AbstractDataModelOperation(this) {
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return OK_STATUS;
- }
- };
- }
- return providerOp;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new DataModelPausibleOperationImpl(getRawOperation());
- }
-
- public String toString() {
- return "IDataModel, provider=" + provider.toString(); //$NON-NLS-1$
- }
-
- public String getID() {
- String id = provider.getID();
- return null != id ? id : ""; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationEventImpl.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationEventImpl.java
deleted file mode 100644
index a8c8ad5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationEventImpl.java
+++ /dev/null
@@ -1,38 +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.frameworks.internal.datamodel;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class DataModelPausibleOperationEventImpl implements IDataModelPausibleOperationEvent {
-
- private IDataModelOperation operation;
- private int operationType;
- private int executionType;
-
- public DataModelPausibleOperationEventImpl(IDataModelOperation operation, int operationType, int executionType) {
- this.operation = operation;
- this.operationType = operationType;
- this.executionType = executionType;
- }
-
- public IDataModelOperation getOperation() {
- return operation;
- }
-
- public int getOperationType() {
- return operationType;
- }
-
- public int getExecutionType() {
- return executionType;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationImpl.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationImpl.java
deleted file mode 100644
index 63bc4b3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/DataModelPausibleOperationImpl.java
+++ /dev/null
@@ -1,587 +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.frameworks.internal.datamodel;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Stack;
-
-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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementManager;
-import org.eclipse.wst.common.frameworks.internal.operations.ComposedExtendedOperationHolder;
-import org.eclipse.wst.common.frameworks.internal.operations.OperationStatus;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class DataModelPausibleOperationImpl extends WrappedOperation implements IDataModelPausibleOperation {
-
- // Stack of StackEntries to be executed
- protected Stack operationStackToExecute = null;
-
- // Stack of StackEntries already executed
- protected Stack undoStack = null;
- protected Stack redoStack = null;
-
- protected OperationStackEntry rootStackEntry = null;
-
- protected List operationListeners;
-
- protected int executionState = NOT_STARTED;
-
- public DataModelPausibleOperationImpl(IDataModelOperation rootOperation) {
- super(rootOperation);
- }
-
- public void addOperationListener(IDataModelPausibleOperationListener operationListener) {
- if (null == operationListeners) {
- operationListeners = new ArrayList();
- }
- operationListeners.add(operationListener);
- }
-
- public void removeOperationListener(IDataModelPausibleOperationListener operationListener) {
- if (null != operationListeners) {
- operationListeners.remove(operationListener);
- }
- }
-
- public int getExecutionState() {
- return executionState;
- }
-
- protected static final int EXECUTE_IMPL = 0;
- protected static final int UNDO_IMPL = 1;
- protected static final int REDO_IMPL = 2;
- protected static final int ROLLBACK_IMPL = 3;
- protected static final int RESUME_IMPL = 4;
-
- private static Hashtable threadToExtendedOpControl = new Hashtable();
-
- protected IStatus cacheThreadAndContinue(IProgressMonitor monitor, IAdaptable info, int runType) throws ExecutionException {
- final Thread currentThread = Thread.currentThread();
- final boolean isTopLevelOperation = !threadToExtendedOpControl.containsKey(currentThread);
- try {
- if (isTopLevelOperation) {
- threadToExtendedOpControl.put(currentThread, this);
- }
- switch (runType) {
- case EXECUTE_IMPL :
- return executeImpl(monitor, info);
- case UNDO_IMPL :
- return undoImpl(monitor, info);
- case REDO_IMPL :
- return redoImpl(monitor, info);
- case ROLLBACK_IMPL :
- return rollBackImpl(monitor, info);
- case RESUME_IMPL :
- return resumeImpl(monitor, info);
- }
- } finally {
- if (isTopLevelOperation) {
- threadToExtendedOpControl.remove(currentThread);
- }
- }
- throw new RuntimeException();
- }
-
- public IStatus resume(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return cacheThreadAndContinue(monitor, info, RESUME_IMPL);
- }
-
- protected IStatus resumeImpl(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- switch (executionState) {
- case NOT_STARTED :
- return executeImpl(monitor, info);
- case PAUSED_EXECUTE :
- case COMPLETE_ROLLBACK :
- return doExecute(monitor, info);
- case PAUSED_UNDO :
- return doUndo(monitor, info);
- case PAUSED_REDO :
- return redoImpl(monitor, info);
- }
- throw new RuntimeException();
- }
-
- public boolean canRedo() {
- return (COMPLETE_UNDO == executionState) && super.canRedo();
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return cacheThreadAndContinue(monitor, info, REDO_IMPL);
- }
-
- protected IStatus redoImpl(IProgressMonitor monitor, IAdaptable info) {
- return doRedo(monitor, info);
- }
-
- protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) {
- try {
- executionState = RUNNING_REDO;
- OperationStatus returnStatus = null;
- int shouldContinue = IDataModelPausibleOperationListener.CONTINUE;
- while (IDataModelPausibleOperationListener.CONTINUE == shouldContinue && !redoStack.isEmpty()) {
- OperationStackEntry stackEntry = (OperationStackEntry) redoStack.peek();
- IDataModelOperation operation = stackEntry.getOperation();
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_STARTING, IDataModelPausibleOperationEvent.REDO);
- shouldContinue = notifyOperationListeners(event);
- if (IDataModelPausibleOperationListener.PAUSE == shouldContinue) {
- continue;
- }
- undoStack.push(redoStack.pop());
- returnStatus = runOperation(operation, monitor, info, IDataModelPausibleOperationEvent.REDO, returnStatus);
- event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_FINISHED, IDataModelPausibleOperationEvent.REDO);
- shouldContinue = notifyOperationListeners(event);
-
- }
- return returnStatus == null ? Status.OK_STATUS : returnStatus;
- } finally {
- executionState = redoStack.isEmpty() ? COMPLETE_REDO : PAUSED_REDO;
- }
- }
-
- public boolean canUndo() {
- return (executionState == COMPLETE_EXECUTE || executionState == COMPLETE_REDO) && super.canUndo();
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return cacheThreadAndContinue(monitor, info, UNDO_IMPL);
- }
-
- protected IStatus undoImpl(IProgressMonitor monitor, IAdaptable info) {
- redoStack = new Stack();
- return doUndo(monitor, info);
- }
-
- protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) {
- try {
- executionState = RUNNING_UNDO;
- OperationStatus returnStatus = null;
- int shouldContinue = IDataModelPausibleOperationListener.CONTINUE;
- while (IDataModelPausibleOperationListener.CONTINUE == shouldContinue && !undoStack.isEmpty()) {
- OperationStackEntry stackEntry = (OperationStackEntry) undoStack.peek();
- IDataModelOperation operation = stackEntry.getOperation();
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_STARTING, IDataModelPausibleOperationEvent.UNDO);
- shouldContinue = notifyOperationListeners(event);
- if (IDataModelPausibleOperationListener.PAUSE == shouldContinue) {
- continue;
- }
- redoStack.push(undoStack.pop());
- returnStatus = runOperation(operation, monitor, info, IDataModelPausibleOperationEvent.UNDO, returnStatus);
- event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_FINISHED, IDataModelPausibleOperationEvent.UNDO);
- shouldContinue = notifyOperationListeners(event);
-
- }
- return returnStatus == null ? Status.OK_STATUS : returnStatus;
- } finally {
- executionState = undoStack.isEmpty() ? COMPLETE_UNDO : PAUSED_UNDO;
- }
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return cacheThreadAndContinue(monitor, info, EXECUTE_IMPL);
- }
-
- protected IStatus executeImpl(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- executionState = RUNNING_EXECUTE;
- undoStack = new Stack();
- operationStackToExecute = new Stack();
- rootStackEntry = new OperationStackEntry(null, rootOperation);
- operationStackToExecute.push(rootStackEntry);
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(rootOperation, IDataModelPausibleOperationEvent.NODE_STARTING, IDataModelPausibleOperationEvent.EXECUTE);
- if (IDataModelPausibleOperationListener.CONTINUE == notifyOperationListeners(event)) {
- return doExecute(monitor, info);
- }
- return Status.OK_STATUS;
- } finally {
- executionState = operationStackToExecute.isEmpty() ? COMPLETE_EXECUTE : PAUSED_EXECUTE;
- }
- }
-
- protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- OperationStatus returnStatus = null;
- int shouldContinue = IDataModelPausibleOperationListener.CONTINUE;
- while (IDataModelPausibleOperationListener.CONTINUE == shouldContinue && !operationStackToExecute.isEmpty()) {
- OperationStackEntry stackEntry = (OperationStackEntry) operationStackToExecute.peek();
- OperationStackEntry preStackEntry = stackEntry.getNextPreOperation();
- if (null != preStackEntry) {
- operationStackToExecute.push(preStackEntry);
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(preStackEntry.getOperation(), IDataModelPausibleOperationEvent.NODE_STARTING, IDataModelPausibleOperationEvent.EXECUTE);
- shouldContinue = notifyOperationListeners(event);
- continue;
- }
- IDataModelOperation stackEntryOperation = stackEntry.getOperationForExecution();
- if (null != stackEntryOperation) {
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(stackEntryOperation, IDataModelPausibleOperationEvent.MAIN_STARTING, IDataModelPausibleOperationEvent.EXECUTE);
- shouldContinue = notifyOperationListeners(event);
- if (IDataModelPausibleOperationListener.PAUSE == shouldContinue) {
- continue;
- }
- returnStatus = runOperation(stackEntryOperation, monitor, info, IDataModelPausibleOperationEvent.EXECUTE, returnStatus);
- undoStack.push(stackEntry);
- event = new DataModelPausibleOperationEventImpl(stackEntryOperation, IDataModelPausibleOperationEvent.MAIN_FINISHED, IDataModelPausibleOperationEvent.EXECUTE);
- shouldContinue = notifyOperationListeners(event);
- if (IDataModelPausibleOperationListener.PAUSE == shouldContinue) {
- continue;
- }
- }
- OperationStackEntry postStackEntry = stackEntry.getNextPostOperation();
- if (null != postStackEntry) {
- operationStackToExecute.push(postStackEntry);
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(postStackEntry.getOperation(), IDataModelPausibleOperationEvent.NODE_STARTING, IDataModelPausibleOperationEvent.EXECUTE);
- shouldContinue = notifyOperationListeners(event);
- continue;
- }
- operationStackToExecute.pop();
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(stackEntry.getOperation(), IDataModelPausibleOperationEvent.NODE_FINISHED, IDataModelPausibleOperationEvent.EXECUTE);
- shouldContinue = notifyOperationListeners(event);
- }
- return returnStatus == null ? Status.OK_STATUS : returnStatus;
- } finally {
- executionState = operationStackToExecute.isEmpty() ? COMPLETE_EXECUTE : PAUSED_EXECUTE;
- }
- }
-
- public IStatus rollBack(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return cacheThreadAndContinue(monitor, info, ROLLBACK_IMPL);
- }
-
- protected IStatus rollBackImpl(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- if (PAUSED_EXECUTE == executionState || PAUSED_ROLLBACK == executionState) {
- try {
- executionState = RUNNING_ROLLBACK;
- OperationStatus returnStatus = null;
- int shouldContinue = IDataModelPausibleOperationListener.CONTINUE;
- while (IDataModelPausibleOperationListener.CONTINUE == shouldContinue && !undoStack.isEmpty()) {
- OperationStackEntry stackEntry = (OperationStackEntry) undoStack.peek();
- IDataModelOperation operation = stackEntry.getOperation();
- DataModelPausibleOperationEventImpl event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_STARTING, IDataModelPausibleOperationEvent.ROLLBACK);
- shouldContinue = notifyOperationListeners(event);
- if (IDataModelPausibleOperationListener.PAUSE == shouldContinue) {
- continue;
- }
- undoStack.pop();
- OperationStackEntry executionTopStackEntry = stackEntry.rollBackOneOperation();
- if (operationStackToExecute.contains(executionTopStackEntry)) {
- while (operationStackToExecute.peek() != executionTopStackEntry) {
- operationStackToExecute.pop();
- }
- } else {
- Stack parentStack = new Stack();
- parentStack.push(executionTopStackEntry);
- OperationStackEntry entry = executionTopStackEntry.parent;
- while (!operationStackToExecute.contains(entry)) {
- parentStack.push(entry);
- entry = entry.parent;
- }
- while (operationStackToExecute.peek() != entry) {
- operationStackToExecute.pop();
- }
- while (!parentStack.isEmpty()) {
- operationStackToExecute.push(parentStack.pop());
- }
- }
- returnStatus = runOperation(operation, monitor, info, IDataModelPausibleOperationEvent.UNDO, returnStatus);
- event = new DataModelPausibleOperationEventImpl(operation, IDataModelPausibleOperationEvent.MAIN_FINISHED, IDataModelPausibleOperationEvent.ROLLBACK);
- shouldContinue = notifyOperationListeners(event);
- }
- return returnStatus == null ? Status.OK_STATUS : returnStatus;
- } finally {
- executionState = undoStack.isEmpty() ? COMPLETE_ROLLBACK : PAUSED_ROLLBACK;
- }
- }
- throw new RuntimeException();
- }
-
- private int notifyOperationListeners(DataModelPausibleOperationEventImpl event) {
- if (null != operationListeners) {
- IDataModelPausibleOperationListener listener = null;
- for (int i = 0; i < operationListeners.size(); i++) {
- listener = (IDataModelPausibleOperationListener) operationListeners.get(i);
- if (IDataModelPausibleOperationListener.PAUSE == listener.notify(event)) {
- return IDataModelPausibleOperationListener.PAUSE;
- }
- }
- }
- return IDataModelPausibleOperationListener.CONTINUE;
- }
-
- protected OperationStatus addStatus(OperationStatus returnStatus, IStatus status) {
- if (returnStatus == null) {
- returnStatus = new OperationStatus(status.getMessage(), status.getException());
- returnStatus.setSeverity(status.getSeverity());
- returnStatus.add(status);
- } else {
- returnStatus.add(status);
- }
- return returnStatus;
- }
-
- private OperationStatus addExtendedStatus(OperationStatus returnStatus, IStatus aStatus) {
- if (returnStatus == null) {
- returnStatus = new OperationStatus(new IStatus[]{WTPCommonPlugin.OK_STATUS});
- }
- returnStatus.addExtendedStatus(aStatus);
- return returnStatus;
- }
-
- private OperationStatus runOperation(final IDataModelOperation operation, final IProgressMonitor monitor, final IAdaptable info, final int executionType, OperationStatus returnStatus) {
- if (rootOperation == operation) {
- IStatus status = runOperation(operation, monitor, info, IDataModelPausibleOperationEvent.EXECUTE);
- if (!status.isOK()) {
- returnStatus = addStatus(returnStatus, status);
- }
- } else {
- try {
- IStatus status = runOperation(operation, monitor, info, IDataModelPausibleOperationEvent.EXECUTE);
- if (!status.isOK()) {
- returnStatus = addExtendedStatus(returnStatus, status);
- }
- } catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, WTPResourceHandler.getString("25", new Object[]{operation.getClass().getName()}), e); //$NON-NLS-1$
- returnStatus = addExtendedStatus(returnStatus, status);
- }
- }
- return returnStatus;
- }
-
- private IStatus runOperation(final IDataModelOperation operation, final IProgressMonitor monitor, final IAdaptable info, final int executionType) {
- IWorkspaceRunnableWithStatus workspaceRunnable = new IWorkspaceRunnableWithStatus(info) {
- public void run(IProgressMonitor pm) throws CoreException {
- try {
- switch (executionType) {
- case IDataModelPausibleOperationEvent.EXECUTE :
- this.setStatus(operation.execute(pm, info));
- break;
- case IDataModelPausibleOperationEvent.UNDO :
- this.setStatus(operation.undo(pm, info));
- break;
- case IDataModelPausibleOperationEvent.REDO :
- this.setStatus(operation.redo(pm, info));
- break;
- }
- if (null == this.getStatus()) {
- this.setStatus(Status.OK_STATUS);
- }
- } catch (Exception e) {
- this.setStatus(new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, WTPResourceHandler.getString("25", new Object[]{operation.getClass().getName()}), e)); //$NON-NLS-1$
- WTPCommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- };
-
- ISchedulingRule rule = operation.getSchedulingRule();
- if (null == rule) {
- rule = ResourcesPlugin.getWorkspace().getRoot();
- }
-
- try {
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, rule, operation.getOperationExecutionFlags(), monitor);
- } catch (CoreException e) {
- workspaceRunnable.setStatus(new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, WTPResourceHandler.getString("25", new Object[]{operation.getClass().getName()}), e)); //$NON-NLS-1$
- }
- return workspaceRunnable.getStatus();
- }
-
- protected class OperationStackEntry {
-
- private IDataModelOperation operation;
- private IDataModelOperation operationForExecution;
-
- private boolean extendedOpsInitialized = false;
-
- private ComposedExtendedOperationHolder extOpHolder = null;
-
- private int preOpIndex = 0;
- private int postOpIndex = 0;
-
- private OperationStackEntry[] preOpStackEntries = null;
- private OperationStackEntry[] postOpStackEntries = null;
-
- public OperationStackEntry parent = null;
-
- public OperationStackEntry(OperationStackEntry parent, IDataModelOperation operation) {
- this.parent = parent;
- this.operation = operation;
- this.operationForExecution = operation;
- }
-
- public OperationStackEntry rollBackOneOperation() {
- postOpIndex = 0;
- operationForExecution = operation;
- if (preOpIndex == 0 && parent != null) {
- return parent.rollBackExtended(this);
- }
- return this;
- }
-
- private OperationStackEntry rollBackExtended(OperationStackEntry extendedEntry) {
- while (postOpIndex > 0) {
- int index = --postOpIndex;
- if (postOpStackEntries[index] == extendedEntry) {
- postOpStackEntries[index] = null;
- return this;
- }
- }
- while (preOpIndex > 0) {
- int index = --preOpIndex;
- if (preOpStackEntries[index] == extendedEntry) {
- preOpStackEntries[index] = null;
- if (index != 0) {
- return this;
- }
- }
- }
- if (null != parent) {
- return parent.rollBackExtended(this);
- }
- return this;
- }
-
- public OperationStackEntry getNextPreOperation() {
- if (!extendedOpsInitialized) {
- initExtendedOps();
- }
- if (extOpHolder == null) {
- return null;
- }
- List ops = extOpHolder.getPreOps();
- if (ops == null || ops.size() <= preOpIndex) {
- return null;
- }
-
- while (preOpIndex < ops.size()) {
- int index = preOpIndex++;
- IDataModelOperation op = (IDataModelOperation) ops.get(index);
- if (shouldExecuteExtended(op.getID())) {
- op.setDataModel(getDataModel());
- op.setEnvironment(getEnvironment());
- preOpStackEntries[index] = new OperationStackEntry(this, op);
- return preOpStackEntries[index];
- }
- }
- return null;
- }
-
- public String toString() {
- return getOperationID();
- }
-
- public String getOperationID() {
- return operation.getID();
- }
-
- public IDataModelOperation getOperation() {
- return operation;
- }
-
- public boolean executed() {
- return null != operationForExecution;
- }
-
- /**
- * The root operation is only returned once; this way it is known whether it has been
- * executed yet or not.
- *
- * @return
- */
- public IDataModelOperation getOperationForExecution() {
- try {
- return operationForExecution;
- } finally {
- operationForExecution = null;
- }
- }
-
- public OperationStackEntry getNextPostOperation() {
- if (!extendedOpsInitialized) {
- initExtendedOps();
- }
- if (extOpHolder == null) {
- return null;
- }
- List ops = extOpHolder.getPostOps();
- if (ops == null || ops.size() <= postOpIndex) {
- return null;
- }
-
- while (postOpIndex < ops.size()) {
- int index = postOpIndex++;
- IDataModelOperation op = (IDataModelOperation) ops.get(index);
- if (shouldExecuteExtended(op.getID())) {
- op.setDataModel(getDataModel());
- op.setEnvironment(getEnvironment());
- postOpStackEntries[index] = new OperationStackEntry(this, op);
- return postOpStackEntries[index];
- }
- }
- return null;
-
- }
-
- private void initExtendedOps() {
- if (shouldExecuteExtended(operation.getID())) {
- extOpHolder = ComposedExtendedOperationHolder.createExtendedOperationHolder(operation.getID());
- if (null != extOpHolder) {
- if (extOpHolder.hasPreOps()) {
- preOpStackEntries = new OperationStackEntry[extOpHolder.getPreOps().size()];
- }
- if (extOpHolder.hasPostOps()) {
- postOpStackEntries = new OperationStackEntry[extOpHolder.getPostOps().size()];
- }
- }
- }
- extendedOpsInitialized = true;
- }
- }
-
- protected boolean shouldExecuteExtended(String operationID) {
- // Check the top most level operation first
- DataModelPausibleOperationImpl threadRootOperation = (DataModelPausibleOperationImpl) threadToExtendedOpControl.get(Thread.currentThread());
- if (threadRootOperation != this && threadRootOperation.getDataModel() != getDataModel() && !threadRootOperation.shouldExecuteExtended(operationID)) {
- return false;
- }
- // No extended operations are being executed
- boolean allowExtensions = getDataModel().getBooleanProperty(IDataModelProperties.ALLOW_EXTENSIONS);
- if (!allowExtensions) {
- return false;
- }
- // This specific operation should not be executed
- List restrictedExtensions = (List) getDataModel().getProperty(IDataModelProperties.RESTRICT_EXTENSIONS);
- if (restrictedExtensions.contains(operationID)) {
- return false;
- }
- // This specific function group should not be executed
- List extendedContext = getDataModel().getExtendedContext();
- for (int contextCount = 0; contextCount < extendedContext.size(); contextCount++) {
- IProject project = (IProject) AdaptabilityUtility.getAdapter(extendedContext.get(contextCount), IProject.class);
- if (null != project && !IEnablementManager.INSTANCE.getIdentifier(operationID, project).isEnabled()) {
- return false;
- }
- }
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperation.java
deleted file mode 100644
index e5d94a7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperation.java
+++ /dev/null
@@ -1,318 +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.frameworks.internal.datamodel;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * <p>
- * IDataModelManagerOperation is an IDataModelOperation returned from
- * {@linkorg.eclipse.wst.common.frameworks.datamodel.IDataModel#getDefaultOperation()}. This Operation wraps the IDataModelOperation returned
- * from the IDatModelProvider backing the IDataModel that created it.
- * </p>
- * <p>
- * This operation supports pre and post operation execution. Pre and post operations are
- * IDataModelOperations registered through the OperationExtension extension point which are executed
- * before and after the primary operation.
- * </p>
- * <p>
- * <b>Example 1</b> <br>
- * Suppose an IDataModelProvider returns IDataModelOperation X as its default operation, and this
- * IDataModelManagerOperation is wrapping X. Also suppose operation A is registered as a pre
- * operation to X and operation B is registered as a post operation to X. When this
- * IDataModelManagerOperation is executed the following operations will be executed in this order:
- * A, X, B which may be thought as a preorder execution of the following tree:
- * </p>
- *
- * <pre>
- * X
- * / \
- * A B
- *
- * execution = A.execute(), X.execute(), B.execute()
- * undo = B.undo(), X.undo(), A.undo()
- * redo = A.redo(), X.redo(), B.redo()
- * </pre>
- *
- * <p>
- * <b>Example 2</b> <br>
- * If A had a pre operation C and post operation D, and B had a pre operation E and post operation F
- * then the tree would look like:
- * </p>
- *
- * <pre>
- * X
- * / \
- * / \
- * A B
- * / \ / \
- * C D E F
- *
- * execution = C.execute(), A.execute(), D.execute(), X.execute(), E.execute(), B.execute(), F.execute()
- * undo = F.undo(), B.undo(), E.undo(), X.undo(), D.undo(), A.undo(), C.undo()
- * redo = C.redo(), A.redo(), D.redo(), X.redo(), E.redo(), B.redo(), F.redo()
- * </pre>
- *
- * </p>
- * <b>Example 3</b> <br>
- * If there is more than one pre operation or post operation for a particular operation, then there
- * is no defined ordering of those pre and post operation with respect to each other, other than
- * that it will be consistent. For example suppose operation X had only two pre operations, A and B,
- * and two post operations, C and D. The execution tree would be one of the following:
- * </p>
- *
- * <pre>
- * X X X X
- * / \ / \ / \ / \
- * AB CD BA CD AB DC BA DC
- *
- * exec = ABXCD exec = BAXCD exec = ABXDC exec = BAXDC
- * undo = DCXBA undo = DCXAB undo = CDXBA undo = CDXAB
- * redo = ABXCD redo = BAXCD redo = ABXDC redo = BAXDC
- * </pre>
- *
- * <p>
- * During execution, rollback, undo, and redo, {@link IDataModelPausibleOperationEvent}s are fired to all
- * registered {@link IDataModelPausibleOperationListener}s giving each of them an opportunity to pause the
- * operation by returning {@link IDataModelPausibleOperationListener#PAUSE}.
- * {@link IDataModelPausibleOperationEvent} has more details on when these events are fired.
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @seeorg.eclipse.wst.common.frameworks.datamodel.IDataModel#getDefaultOperation()
- *
- * @since 1.5
- */
-public interface IDataModelPausibleOperation extends IDataModelOperation {
-
- /**
- * <p>
- * The exeuction state when the operation never been executed. When the operation is in this
- * state it may only be executed.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(IProgressMonitor, IAdaptable)
- */
- public static final int NOT_STARTED = 0;
- /**
- * <p>
- * The exeuction state while the operation is executing. When the operation is in this state it
- * may only be paused by an {@link IDataModelPausibleOperationListener}.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(IProgressMonitor, IAdaptable)
- * @see IDataModelPausibleOperationListener
- */
- public static final int RUNNING_EXECUTE = 1;
- /**
- * <p>
- * The exeuction state while the operation is rolling back. When the operation is in this state
- * it may only be paused by an {@link IDataModelPausibleOperationListener}.
- * </p>
- *
- * @see #rollBack(IProgressMonitor, IAdaptable)
- * @see IDataModelPausibleOperationListener
- */
- public static final int RUNNING_ROLLBACK = 2;
- /**
- * <p>
- * The exeuction state while the operation is redoing. When the operation is in this state it
- * may only be paused by an {@link IDataModelPausibleOperationListener}.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(IProgressMonitor, IAdaptable)
- * @see IDataModelPausibleOperationListener
- */
- public static final int RUNNING_UNDO = 3;
- /**
- * <p>
- * The exeuction state while the operaiton is redoing. When the operation is in this state it
- * may only be paused by an {@link IDataModelPausibleOperationListener}.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(IProgressMonitor, IAdaptable)
- * @see IDataModelPausibleOperationListener
- */
- public static final int RUNNING_REDO = 4;
- /**
- * <p>
- * The exeuction state when the operation has been paused while it was executing. When the
- * operation is in this state it may either be resumed to continue execution or rolled back to
- * undo the partial execution.
- * </p>
- *
- * @see #resume(IProgressMonitor, IAdaptable)
- * @see #rollBack(IProgressMonitor, IAdaptable)
- */
- public static final int PAUSED_EXECUTE = 5;
- /**
- * <p>
- * The exeuction state when the operation has been paused while it was rolling back. When the
- * operation is in this state it may either be resumed to continue rolling back or executed
- * which continue the foward execution from the point where the rollback was paused
- * </p>
- *
- * @see #resume(IProgressMonitor, IAdaptable)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(IProgressMonitor, IAdaptable)
- */
- public static final int PAUSED_ROLLBACK = 6;
- /**
- * <p>
- * The exeuction state when the operation has been paused while it was undoing. When the
- * operation is in this state it may be only be resumed to continue undoing.
- * </p>
- *
- * @see #resume(IProgressMonitor, IAdaptable)
- */
- public static final int PAUSED_UNDO = 7;
- /**
- * <p>
- * The exeuction state when the operation has been paused while it was redoing. When the
- * operation is in this state it may only be resumed to continue redoing.
- * </p>
- *
- * @see #resume(IProgressMonitor, IAdaptable)
- */
- public static final int PAUSED_REDO = 8;
- /**
- * <p>
- * The exeuction state when the operation finished execution. When the operation is in this
- * state it may only be undone.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(IProgressMonitor, IAdaptable)
- */
- public static final int COMPLETE_EXECUTE = 9;
- /**
- * <p>
- * The exeuction state when the operation finished rolling back. When the operation is in this
- * state it may only be executed.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(IProgressMonitor, IAdaptable)
- */
- public static final int COMPLETE_ROLLBACK = 10;
- /**
- * <p>
- * The exeuction state when the operation finished undoing. When the operation is in this state
- * it may only be redone.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(IProgressMonitor, IAdaptable)
- */
- public static final int COMPLETE_UNDO = 11;
- /**
- * <p>
- * The exeuction state when the operation finished redoing. When the operation is in this state
- * it may only be udone.
- * </p>
- *
- * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(IProgressMonitor, IAdaptable)
- */
- public static final int COMPLETE_REDO = 12;
-
-
- /**
- * <p>
- * Returns the current execution state of the operation. Returns one of:
- * <ul>
- * <li>{@link #NOT_STARTED}</li>
- * <li>{@link #RUNNING_EXECUTE}</li>
- * <li>{@link #RUNNING_ROLLBACK}</li>
- * <li>{@link #RUNNING_UNDO}</li>
- * <li>{@link #RUNNING_REDO}</li>
- * <li>{@link #PAUSED_EXECUTE}</li>
- * <li>{@link #PAUSED_ROLLBACK}</li>
- * <li>{@link #PAUSED_UNDO}</li>
- * <li>{@link #PAUSED_REDO}</li>
- * <li>{@link #COMPLETE_EXECUTE}</li>
- * <li>{@link #COMPLETE_ROLLBACK}</li>
- * <li>{@link #COMPLETE_UNDO}</li>
- * <li>{@link #COMPLETE_REDO}</li>
- * </ul>
- * <p>
- *
- * @return The current execution state.
- */
- public int getExecutionState();
-
- /**
- * <p>
- * Resumes execution if the operation is curently paused. An operation is paused if
- * {@link #getExecutionState()} returns any of {@link #PAUSED_EXECUTE},
- * {@link #PAUSED_ROLLBACK}, {@link #PAUSED_UNDO}, or {@link #PAUSED_REDO}.
- * </p>
- *
- * @param monitor
- * the progress monitor (or <code>null</code>) to use for reporting progress to
- * the user.
- * @param info
- * the IAdaptable (or <code>null</code>) provided by the caller in order to supply
- * UI information for prompting the user if necessary. When this parameter is not
- * <code>null</code>, it should minimally contain an adapter for the
- * org.eclipse.swt.widgets.Shell.class.
- *
- * @return the IStatus of the resume. The status severity should be set to <code>OK</code> if
- * the operation was successful, and <code>ERROR</code> if it was not. Any other
- * status is assumed to represent an incompletion of the resume.
- */
- public IStatus resume(IProgressMonitor monitor, IAdaptable info) throws ExecutionException;
-
- /**
- * <p>
- * Rolls back the partial execution if the operation is currently in
- * {@link #getExecutionState()} returns eiter {@link #PAUSED_EXECUTE} or
- * {@link #PAUSED_ROLLBACK}.
- * </p>
- *
- * @param monitor
- * the progress monitor (or <code>null</code>) to use for reporting progress to
- * the user.
- * @param info
- * the IAdaptable (or <code>null</code>) provided by the caller in order to supply
- * UI information for prompting the user if necessary. When this parameter is not
- * <code>null</code>, it should minimally contain an adapter for the
- * org.eclipse.swt.widgets.Shell.class.
- *
- * @return the IStatus of the resume. The status severity should be set to <code>OK</code> if
- * the operation was successful, and <code>ERROR</code> if it was not. Any other
- * status is assumed to represent an incompletion of the resume.
- *
- */
- public IStatus rollBack(IProgressMonitor monitor, IAdaptable info) throws ExecutionException;
-
- /**
- * <p>
- * Adds an operation listener to listen for operation events.
- * </p>
- *
- * @param operationListener
- * the IOperationListener to add.
- */
- public void addOperationListener(IDataModelPausibleOperationListener operationListener);
-
- /**
- * <p>
- * Removes the specified IOperationLinstener.
- * <p>
- *
- * @param operationListener
- * The IOperatoinListener to remove.
- */
- public void removeOperationListener(IDataModelPausibleOperationListener operationListener);
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationEvent.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationEvent.java
deleted file mode 100644
index 8b67808..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationEvent.java
+++ /dev/null
@@ -1,253 +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.frameworks.internal.datamodel;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * <p>
- * These events are fired to {@link IDataModelPausibleOperationListener}s from {@link IDataModelPausibleOperation}s during execution, rollback, undo,
- * and redo.
- * </p>
- *
- * <p>
- * <b>Example 2</b> from {@link IDataModelPausibleOperation}<br>
- * <pre>
- * X
- * / \
- * / \
- * A B
- * / \ / \
- * C D E F
- * </pre>
- * In the example above, the events will be fired in the following order during an execution:
- * <table border=1>
- * <tr><th>operation</th><th>operation type</th><th>execution type</th></tr>
- * <tr><td>X</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>A</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>C</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>C</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>C</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>C</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>A</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>A</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>D</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>D</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>D</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>D</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>A</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>X</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>X</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>B</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>E</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>E</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>E</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>E</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>B</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>B</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>F</td><td>NODE_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>F</td><td>MAIN_STARTING</td><td>EXECUTE</td></tr>
- * <tr><td>F</td><td>MAIN_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>F</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>B</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * <tr><td>X</td><td>NODE_FINISHED</td><td>EXECUTE</td></tr>
- * </table>
- * </p>
- * <p>
- * <b>Example 2</b> from {@link IDataModelPausibleOperation}<br>
- * <pre>
- * X
- * / \
- * / \
- * A B
- * / \ / \
- * C D E F
- * </pre>
- * In the example above, the events will be fired in the following order during a rollback:
- * <table border=1>
- * <tr><th>operation</th><th>operation type</th><th>execution type</th></tr>
- * <tr><td>F</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>F</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>B</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>B</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>E</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>E</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>X</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>X</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>D</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>D</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>A</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>A</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * <tr><td>C</td><td>MAIN_STARTING</td><td>ROLLBACK</td></tr>
- * <tr><td>C</td><td>MAIN_FINISHED</td><td>ROLLBACK</td></tr>
- * </table>
- * </p>
- * <p>
- * <b>Example 2</b> from {@link IDataModelPausibleOperation}<br>
- * <pre>
- * X
- * / \
- * / \
- * A B
- * / \ / \
- * C D E F
- * </pre>
- * In the example above, the events will be fired in the following order during an undo:
- * <table border=1>
- * <tr><th>operation</th><th>operation type</th><th>execution type</th></tr>
- * <tr><td>F</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>F</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>B</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>B</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>E</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>E</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>X</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>X</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>D</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>D</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>A</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>A</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>C</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>C</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * </table>
- * </p>
- * <p>
- * <b>Example 2</b> from {@link IDataModelPausibleOperation}<br>
- * <pre>
- * X
- * / \
- * / \
- * A B
- * / \ / \
- * C D E F
- * </pre>
- * In the example above, the events will be fired in the following order during a redo:
- * <table border=1>
- * <tr><th>operation</th><th>operation type</th><th>execution type</th></tr>
- * <tr><td>C</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>C</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>A</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>A</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>D</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>D</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>X</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>X</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>E</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>E</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>B</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>B</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * <tr><td>F</td><td>MAIN_STARTING</td><td>UNDO</td></tr>
- * <tr><td>F</td><td>MAIN_FINISHED</td><td>UNDO</td></tr>
- * </table>
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @since 1.5
- */
-public interface IDataModelPausibleOperationEvent {
-
- /**
- * <p>
- * The operation type set when an operation execution traversal is about to start within the
- * tree of operations handled by the owning {@link IDataModelPausibleOperation}. This operation
- * type is only set when the execution type is set to {@link #EXECUTE}. Using the example
- * above, events with this operation type will be fired according to an in order traversal of
- * the tree; i.e. XACDBEF
- * </p>
- */
- public static final int NODE_STARTING = 1;
- /**
- * <p>
- * The operation type set when an operation execution traversal finishes within the tree of
- * operations handled by the owning {@link IDataModelPausibleOperation}. This operation type is
- * only set when the execution type is set to {@link #EXECUTE}. Using the example above, events
- * with this operation type will be fired according to a post order traversal of the tree; i.e.
- * CDAEFBX
- * </p>
- */
- public static final int NODE_FINISHED = 2;
- /**
- * <p>
- * The operation type set right before an operation is going to do its work. This operation type
- * may be used with all exection types. Using the example above, events with this operiton type
- * will be fired according to the following tree traversal: CADXBEF
- * <p>
- */
- public static final int MAIN_STARTING = 3;
- /**
- * <p>
- * The operation type set immediatly after an operation finshed doing its work. This operation
- * type may be used with all exection types. Using the example above, events with this operiton
- * type will be fired according to the following tree traversal: CADXBEF
- * <p>
- */
- public static final int MAIN_FINISHED = 4;
-
- /**
- * <p>
- * The execution type set when during execution.
- * </p>
- */
- public static final int EXECUTE = 0;
- /**
- * <p>
- * The execution type set when during rollback.
- * </p>
- */
- public static final int ROLLBACK = 1;
- /**
- * <p>
- * The execution type set when during undo.
- * </p>
- */
- public static final int UNDO = 2;
- /**
- * <p>
- * The execution type set when during redo.
- * </p>
- */
- public static final int REDO = 3;
-
- /**
- * <p>
- * Returns the operation in question. This operation will be one of the operations within the
- * tree of operations handled by the owning {@link IDataModelPausibleOperation}.
- * </p>
- *
- * @return the operation.
- */
- public IDataModelOperation getOperation();
-
- /**
- * <p>
- * Returns the type of operation with respect to the {@link IDataModelPausibleOperation}
- * executing it. This will be one of {@link #NODE_STARTING}, {@link #NODE_FINISHED},
- * {@link #MAIN_STARTING}, or {@link #MAIN_FINISHED}.
- * </p>
- *
- * @return one of {@link #NODE_STARTING}, {@link #NODE_FINISHED}, {@link #MAIN_STARTING}, or
- * {@link #MAIN_FINISHED}.
- */
- public int getOperationType();
-
- /**
- * <p>
- * Returns the type of execution the operation is about to begin. This will be one of
- * {@link #EXECUTE}, {@link #ROLLBACK}, {@link #UNDO}, or {@link #REDO}.
- * </p>
- *
- * @return one of {@link #EXECUTE}, {@link #ROLLBACK}, {@link #UNDO}, or {@link #REDO}.
- */
- public int getExecutionType();
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationListener.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationListener.java
deleted file mode 100644
index 865f472..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IDataModelPausibleOperationListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.datamodel;
-
-/**
- * <p>
- * Used to listen for {@link IDataModelPausibleOperationEvent}s fired from {@link IDataModelPausibleOperation}s.
- * </p>
- *
- * @since 1.5
- */
-public interface IDataModelPausibleOperationListener {
-
- /**
- * <p>
- * Clients should return this constant from {@link #notify(IDataModelPausibleOperationEvent)} to specify that
- * execution should continue.
- * </p>
- */
- public static final int CONTINUE = 0;
-
- /**
- * <p>
- * Clients should return this constant from {@link #notify(IDataModelPausibleOperationEvent)} to specify that
- * execution should pause.
- * </p>
- */
- public static final int PAUSE = 1;
-
-
- /**
- * <p>
- * Listener interface by {@link IDataModelPausibleOperation} for operation execution
- * notification. Prior to starting any operation's execution, notifications will be sent which
- * allow clients to pause an operation's execution. Implementers should return {@link #CONTINUE}
- * to allow the operation's execution to continue or {@link #PAUSE} to pause execution. If
- * {@link #PAUSE} is returned, then the entire operation stack will be paused until it is
- * resumed. The responsiblity for resuming a paused operation lies on the client that paused it.
- * </p>
- *
- * @param event
- * The operation event
- *
- * @return return CONTINUE to continue, or PAUSE to pause.
- *
- * @see IDataModelPausibleOperation#addOperationListener(IDataModelPausibleOperationListener)
- * @see IDataModelPausibleOperation#resume(org.eclipse.core.runtime.IProgressMonitor,
- * org.eclipse.core.runtime.IAdaptable)
- */
- public int notify(IDataModelPausibleOperationEvent event);
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IWorkspaceRunnableWithStatus.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IWorkspaceRunnableWithStatus.java
deleted file mode 100644
index 2214bd0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/IWorkspaceRunnableWithStatus.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.frameworks.internal.datamodel;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-public class IWorkspaceRunnableWithStatus implements IWorkspaceRunnable {
- private IAdaptable info;
- private IStatus status;
-
-public IWorkspaceRunnableWithStatus(IAdaptable info) {
- super();
- this.info = info;
- }
-public IAdaptable getInfo() {
- // TODO Auto-generated method stub
- return info;
-}
-public void setStatus(IStatus aStatus) {
- status = aStatus;
-}
-
-public void run(IProgressMonitor monitor) throws CoreException {
-
- }
-public IStatus getStatus() {
- return status;
-}
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/WrappedOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/WrappedOperation.java
deleted file mode 100644
index 7e35853..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/datamodel/WrappedOperation.java
+++ /dev/null
@@ -1,114 +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.frameworks.internal.datamodel;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WrappedOperation implements IDataModelOperation {
-
- protected IDataModelOperation rootOperation;
-
- public WrappedOperation(IDataModelOperation rootOperation) {
- this.rootOperation = rootOperation;
- if (null == rootOperation) {
- throw new NullPointerException();
- }
- }
-
- public boolean canExecute() {
- return rootOperation.canExecute();
- }
-
- public boolean canRedo() {
- return rootOperation.canRedo();
- }
-
- public boolean canUndo() {
- return rootOperation.canUndo();
- }
-
- public void setID(String id) {
- rootOperation.setID(id);
- }
-
- public String getID() {
- return rootOperation.getID();
- }
-
- public void setDataModel(IDataModel model) {
- rootOperation.setDataModel(model);
- }
-
- public IDataModel getDataModel() {
- return rootOperation.getDataModel();
- }
-
- public void setEnvironment(IEnvironment environment) {
- rootOperation.setEnvironment(environment);
- }
-
- public IEnvironment getEnvironment() {
- return rootOperation.getEnvironment();
- }
-
- public ISchedulingRule getSchedulingRule() {
- return rootOperation.getSchedulingRule();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return rootOperation.execute(monitor, info);
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return rootOperation.undo(monitor, info);
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return rootOperation.redo(monitor, info);
- }
-
- public int getOperationExecutionFlags() {
- return rootOperation.getOperationExecutionFlags();
- }
-
- public String getLabel() {
- return rootOperation.getLabel();
- }
-
- public IUndoContext[] getContexts() {
- return rootOperation.getContexts();
- }
-
- public boolean hasContext(IUndoContext context) {
- return rootOperation.hasContext(context);
- }
-
- public void addContext(IUndoContext context) {
- rootOperation.addContext(context);
- }
-
- public void removeContext(IUndoContext context) {
- rootOperation.removeContext(context);
- }
-
- public void dispose() {
- rootOperation.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AbstractIdentifiable.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AbstractIdentifiable.java
deleted file mode 100644
index f7d143e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AbstractIdentifiable.java
+++ /dev/null
@@ -1,29 +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.frameworks.internal.enablement;
-
-public class AbstractIdentifiable implements Identifiable {
-
- protected String id;
-
- public AbstractIdentifiable(String id) {
- this.id = id;
- }
-
- public String getID() {
- return id;
- }
-
- public int getLoadOrder() {
- return 0;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java
deleted file mode 100644
index 39afa0c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java
+++ /dev/null
@@ -1,56 +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 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.Comparator;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AscendingGroupComparator implements Comparator {
- private static AscendingGroupComparator singleton;
-
- public int compare(Object o1, Object o2) {
- if (o2 == null && o1 != null)
- return -1;
- if (o1 == null && o2 != null)
- return 1;
- if (o1 == null && o2 == null)
- return 0;
-
- FunctionGroup group1 = (FunctionGroup) o1;
- FunctionGroup group2 = (FunctionGroup) o2;
-
- if (group1.getPriority() > group2.getPriority())
- return 1;
- if (group1.getPriority() == group2.getPriority())
- return 0;
- if (group1.getPriority() < group2.getPriority())
- return -1;
- return 0;
- }
-
- public static Comparator singleton() {
- if (singleton == null)
- singleton = new AscendingGroupComparator();
- return singleton;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DataModelEnablementFactory.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DataModelEnablementFactory.java
deleted file mode 100644
index 9de1253..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DataModelEnablementFactory.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.frameworks.internal.enablement;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class DataModelEnablementFactory {
- /**
- * Looks up the appropriate IDataModelProvider by the specified providerKind String and a
- * context of the containing Project. The method gets an array of DataModelProviderDescriptor
- * from the base DataModelFactory then filters out Providers based on function group enablement.
- * Finally the Provider with the highest priority is returned. If the IDataModelProvider is not
- * found then a RuntimeException is logged and null is returned.
- *
- * @param providerKind
- * the String id of the provider kind
- * @param curProject
- * the containing IProject
- *
- * @return a new IDataModel
- */
- public static IDataModel createDataModel(String providerKind, IProject curProject) {
- String[] providerIDs = DataModelFactory.getDataModelProviderIDsForKind(providerKind);
- if (providerIDs == null || providerIDs.length == 0)
- return null;
- String topProvider = getHighestPriorityEnabledProviderDesc(providerIDs, curProject);
- if (topProvider == null)
- return null;
- return DataModelFactory.createDataModel(topProvider);
- }
-
- private static String getHighestPriorityEnabledProviderDesc(String[] providerIDs, IProject curProject) {
- String defaultID = providerIDs[0];
- IEnablementIdentifier enablementIdentifier;
- Identifiable tempIdentifiable;
- Identifiable topPriorityIdentifiable = null;
-
- for (int i = 1; i < providerIDs.length; i++) {
- tempIdentifiable = new AbstractIdentifiable(providerIDs[i]);
- enablementIdentifier = EnablementManager.INSTANCE.getIdentifier(tempIdentifiable.getID(), curProject);
- if (enablementIdentifier.isEnabled()) {
- if (topPriorityIdentifiable == null)
- topPriorityIdentifiable = tempIdentifiable;
- else if (IdentifiableComparator.instance.compare(tempIdentifiable, topPriorityIdentifiable) == IdentifiableComparator.GREATER_THAN)
- topPriorityIdentifiable = tempIdentifiable;
- }
- }
- if (topPriorityIdentifiable == null)
- return defaultID;
- return topPriorityIdentifiable.getID();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java
deleted file mode 100644
index 0720856..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java
+++ /dev/null
@@ -1,58 +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 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.Comparator;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class DescendingGroupComparator implements Comparator {
-
- private static DescendingGroupComparator singleton;
-
- public int compare(Object o1, Object o2) {
- if (o1 == null && o2 != null)
- return -1;
- if (o2 == null && o1 != null)
- return 1;
- if (o1 == null && o2 == null)
- return 0;
-
- FunctionGroup group1 = (FunctionGroup) o1;
- FunctionGroup group2 = (FunctionGroup) o2;
-
- if (group1.getPriority() > group2.getPriority())
- return -1;
- if (group1.getPriority() == group2.getPriority())
- return 0;
- if (group1.getPriority() < group2.getPriority())
- return 1;
- return 0;
-
- }
-
- public static Comparator singleton() {
- if (singleton == null)
- singleton = new DescendingGroupComparator();
- return singleton;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifier.java
deleted file mode 100644
index a6dbbd9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifier.java
+++ /dev/null
@@ -1,233 +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 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EnablementIdentifier implements IEnablementIdentifier {
-
- private final static int HASH_FACTOR = 89;
-
- private final static int HASH_INITIAL = EnablementIdentifier.class.getName().hashCode();
-
- private final static Set strongReferences = new HashSet();
-
- private Set functionGroupIds;
-
- private transient String[] functionGroupIdsAsArray;
-
- private boolean enabled;
-
- private transient int hashCode;
-
- private transient boolean hashCodeComputed;
-
- private String id;
-
- private List identifierListeners;
-
- private transient String string;
-
- private IProject project;
-
- protected EnablementIdentifier(String id) {
- this(id, null);
- }
-
- protected EnablementIdentifier(String id, IProject project) {
- if (id == null)
- throw new NullPointerException();
- this.id = id;
- this.project = project;
- }
-
- public void addIdentifierListener(IEnablementIdentifierListener identifierListener) {
- if (identifierListener == null)
- throw new NullPointerException();
-
- if (identifierListeners == null)
- identifierListeners = new ArrayList();
-
- if (!identifierListeners.contains(identifierListener))
- identifierListeners.add(identifierListener);
-
- strongReferences.add(this);
- }
-
- public int compareTo(Object object) {
- EnablementIdentifier castedObject = (EnablementIdentifier) object;
- return Util.compare(id, castedObject.id);
-
- }
-
- public boolean equals(Object object) {
- if (!(object instanceof EnablementIdentifier))
- return false;
-
- EnablementIdentifier castedObject = (EnablementIdentifier) object;
- boolean equals = Util.equals(id, castedObject.id);
- return equals;
- }
-
- protected void fireIdentifierChanged(EnablementIdentifierEvent functionIdentifierEvent) {
- if (functionIdentifierEvent == null)
- throw new NullPointerException();
-
- if (identifierListeners != null) {
- synchronized (identifierListeners) {
- for (int i = 0; i < identifierListeners.size(); i++)
- ((IEnablementIdentifierListener) identifierListeners.get(i)).identifierChanged(functionIdentifierEvent);
- }
- }
- }
-
- public Set getFunctionGroupIds() {
- return functionGroupIds;
- }
-
- public String getId() {
- return id;
- }
-
- public int hashCode() {
- if (!hashCodeComputed) {
- hashCode = HASH_INITIAL;
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(id);
- hashCodeComputed = true;
- }
-
- return hashCode;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void removeIdentifierListener(IEnablementIdentifierListener identifierListener) {
- if (identifierListener == null)
- throw new NullPointerException();
-
- if (identifierListeners != null)
- identifierListeners.remove(identifierListener);
-
- if (identifierListeners.isEmpty())
- strongReferences.remove(this);
- }
-
- protected boolean setFunctionGroupIds(Set functionGroupIds) {
- functionGroupIds = Util.safeCopy(functionGroupIds, String.class);
-
- if (!Util.equals(functionGroupIds, this.functionGroupIds)) {
- this.functionGroupIds = functionGroupIds;
- this.functionGroupIdsAsArray = (String[]) this.functionGroupIds.toArray(new String[this.functionGroupIds.size()]);
-
- hashCodeComputed = false;
- hashCode = 0;
- string = null;
- return true;
- }
-
- return false;
- }
-
- protected boolean setEnabled(boolean enabled) {
- if (enabled != this.enabled) {
- this.enabled = enabled;
- hashCodeComputed = false;
- hashCode = 0;
- string = null;
- return true;
- }
-
- return false;
- }
-
- /**
- * Recompute the enabled state and return whether the state changed
- */
- protected boolean resetEnabled() {
- return setEnabled(getNewEnabled());
- }
-
- protected boolean getNewEnabled() {
- if (project == null)
- return true;
- if (functionGroupIdsAsArray.length == 0)
- return true;
- for (int i = 0; i < functionGroupIdsAsArray.length; i++) {
- FunctionGroup group = FunctionGroupRegistry.getInstance().getGroupByID(functionGroupIdsAsArray[i]);
- if (group != null && group.isEnabled(project))
- return true;
- }
- return false;
- }
-
- public String toString() {
- if (string == null) {
- final StringBuffer stringBuffer = new StringBuffer();
- stringBuffer.append('[');
- stringBuffer.append(functionGroupIds);
- stringBuffer.append(',');
- stringBuffer.append(enabled);
- stringBuffer.append(',');
- stringBuffer.append(id);
- stringBuffer.append(']');
- string = stringBuffer.toString();
- }
-
- return string;
- }
-
- /**
- * The associated Project may be null
- *
- * @return Returns the project.
- */
- public IProject getProject() {
- return project;
- }
-
- public String getPrimaryFunctionGroupId() {
- int selectedPriority = Integer.MAX_VALUE;
- int priority = 0;
- String selectedFunctionGroupId = null;
- String functionGroupId = null;
- for (Iterator iterator = getFunctionGroupIds().iterator(); iterator.hasNext();) {
- functionGroupId = iterator.next().toString();
- priority = FunctionGroupRegistry.getInstance().getGroupPriority(functionGroupId);
- if (priority < selectedPriority)
- selectedFunctionGroupId = functionGroupId;
- if (priority == 0)
- return selectedFunctionGroupId;
- }
- return selectedFunctionGroupId;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java
deleted file mode 100644
index d90b19c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java
+++ /dev/null
@@ -1,78 +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 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EnablementIdentifierEvent {
-
- private boolean functionGroupIdsChanged;
- private boolean enabledChanged;
- private IEnablementIdentifier identifier;
-
- public EnablementIdentifierEvent(IEnablementIdentifier identifier, boolean functionGroupIdsChanged, boolean enabledChanged) {
- if (identifier == null)
- throw new NullPointerException();
-
- this.identifier = identifier;
- this.functionGroupIdsChanged = functionGroupIdsChanged;
- this.enabledChanged = enabledChanged;
- }
-
- /**
- * Returns the instance of the interface that changed.
- *
- * @return the instance of the interface that changed. Guaranteed not to be <code>null</code>.
- */
- public IEnablementIdentifier getIdentifier() {
- return identifier;
- }
-
- /**
- * Returns whether or not the functionGroupIds property changed.
- *
- * @return true, iff the functionGroupIds property changed.
- */
- public boolean hasFunctionGroupIdsChanged() {
- return functionGroupIdsChanged;
- }
-
- /**
- * Returns whether or not the enabled property changed.
- *
- * @return true, iff the enabled property changed.
- */
- public boolean hasEnabledChanged() {
- return enabledChanged;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "EnablementIdentifierEvent [identifier=" + identifier.toString() + ", functionGroupIdsChanged=" + hasFunctionGroupIdsChanged() + ", enabledChanged=" + hasEnabledChanged() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementManager.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementManager.java
deleted file mode 100644
index 4b4b5e8..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/EnablementManager.java
+++ /dev/null
@@ -1,175 +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 Feb 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.frameworks.internal.enablement;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @author mdelder
- */
-public class EnablementManager implements IEnablementManager {
-
- public static final IEnablementManager INSTANCE = new EnablementManager();
-
- private static Map identifiersByProject = new WeakHashMap();
-
- public EnablementManager() {
- }
-
- /**
- * Returns a Map in which the keys are ids and the values are the identifiers
- *
- * @param project
- * @return
- */
- protected Map getIdentifiersById(IProject project) {
- Map aMap = (Map) identifiersByProject.get(project);
- if (aMap == null) {
- aMap = new WeakHashMap();
- identifiersByProject.put(project, aMap);
- }
- return aMap;
- }
-
- public IEnablementIdentifier getIdentifier(String identifierId, IProject project) {
- if (identifierId == null) throw new NullPointerException();
- if (project != null && !project.isAccessible()) project = null;
-
- EnablementIdentifier identifier = null;
- boolean identifierRequiresUpdate = false;
- synchronized(this) {
- Map identifiersById = getIdentifiersById(project);
- identifier = (EnablementIdentifier) identifiersById.get(identifierId);
- if(identifier == null){
- identifierRequiresUpdate = true;
- identifier = createIdentifier(identifierId, project);
- identifiersById.put(identifierId, identifier);
- }
- }
-
- synchronized (identifier){
- if(identifierRequiresUpdate){
- updateIdentifier(identifier);
- }
- return identifier;
- }
- }
-
- protected EnablementIdentifier createIdentifier(String identifierId, IProject project) {
- return new EnablementIdentifier(identifierId, project);
- }
-
- private EnablementIdentifierEvent updateIdentifier(EnablementIdentifier identifier) {
- String id = identifier.getId();
- Set functionGroupIds = new HashSet();
-
- List groups = FunctionGroupRegistry.getInstance().getKnownGroups();
- for (Iterator iterator = groups.iterator(); iterator.hasNext();) {
- FunctionGroup group = (FunctionGroup) iterator.next();
-
- if (group == null)
- throw new IllegalStateException();
- if (group.isMatch(id))
- functionGroupIds.add(group.getGroupID());
- }
-
- boolean functionGroupsChanged = identifier.setFunctionGroupIds(functionGroupIds);
- boolean enabledChanged = identifier.resetEnabled();
-
- if (functionGroupsChanged || enabledChanged)
- return new EnablementIdentifierEvent(identifier, functionGroupsChanged, enabledChanged);
- return null;
- }
-
- /**
- * Notify all identifier listeners that the state of a project has changed that affects the
- * enablement of a group for a project. This method is fail safe, in that if one listener throws
- * an exception while being notified, it will not stop the notification of other listeners.
- *
- * @param evt
- * @throws CoreException
- * if exceptions were caught notifying any of the listeners. Check the status of the
- * core exception for the nested exceptions.
- */
- public final void notifyFunctionGroupChanged(String groupID, IProject project) throws CoreException {
-
- Map identifiers = getIdentifiersById(project);
-
- if (identifiers == null)
- return;
-
- EnablementIdentifier identifier = null;
- Iterator iter = identifiers.values().iterator();
- IStatus errorStatus = null;
- IStatus nextStatus = null;
-
- while (iter.hasNext()) {
- identifier = (EnablementIdentifier) iter.next();
-
- EnablementIdentifierEvent evt = updateIdentifier(identifier);
- try {
- if (evt != null)
- identifier.fireIdentifierChanged(evt);
- } catch (Exception ex) {
- //Defer the exception so others can handle it.
- nextStatus = WTPCommonPlugin.createErrorStatus(WTPCommonMessages.INTERNAL_ERROR, ex);
- Logger.getLogger().logError(ex);
- if (errorStatus == null)
- errorStatus = nextStatus;
- else if (errorStatus.isMultiStatus())
- ((MultiStatus) errorStatus).add(nextStatus);
- else {
- IStatus[] children = {errorStatus, nextStatus};
- errorStatus = new MultiStatus(errorStatus.getPlugin(), errorStatus.getCode(), children, WTPCommonMessages.INTERNAL_ERROR, null);
- }
- }
-
- }
- if (errorStatus != null)
- throw new CoreException(errorStatus);
-
- }
-
- /**
- * Utility method for clients to dispose of listeners
- *
- * @param enablementIdentifiers
- * @param listener
- */
- public void removeEnablementIdentifierListener(Collection enablementIdentifiers, IEnablementIdentifierListener listener) {
- Iterator iter = enablementIdentifiers.iterator();
- while (iter.hasNext()) {
- IEnablementIdentifier identifier = (IEnablementIdentifier) iter.next();
- identifier.removeIdentifierListener(listener);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroup.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroup.java
deleted file mode 100644
index 8fb8259..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroup.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
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-
-
-/**
- * @author mdelder/blancett
- */
-public class FunctionGroup implements Comparable {
-
- public static final String GROUP_NAME_ATTR = "name"; //$NON-NLS-1$
- public static final String GROUP_DESC_ATTR = "description"; //$NON-NLS-1$
- public static final String GROUP_ENABLED_BY_DEFAULT_ATTR = "enabledByDefault"; //$NON-NLS-1$
- public static final String GROUP_PRIORITY_ATTR = "priority"; //$NON-NLS-1$
- public static final String GROUP_INTIALIZER_CLASS_ATTR = "initializerClassName"; //$NON-NLS-1$
- private static final int NEGATIVE_PRIORITY = -1;
-
- private String groupID;
- private String name;
- private String description;
- private String intializerClassName;
- private String declaringExtension;
- private int priority = NEGATIVE_PRIORITY;
- private IConfigurationElement element;
- private IGroupInitializer groupInterface;
- private Set functionGroupPatternBindings;
-// private transient FunctionGroupPatternBinding[] functionGroupPatternBindingsAsArray;
- private boolean errorReported = false;
-
- public FunctionGroup(String groupID, IConfigurationElement element) {
- this.groupID = groupID;
- this.element = element;
- }
-
- public String getDescription() {
- if (description == null)
- description = element.getAttribute(GROUP_DESC_ATTR);
- return description;
- }
-
- String getInitalizerClassName() {
- if (intializerClassName == null)
- intializerClassName = element.getAttribute(GROUP_INTIALIZER_CLASS_ATTR);
- return intializerClassName;
- }
-
- public String getName() {
- if (name == null)
- name = element.getAttribute(GROUP_NAME_ATTR);
- return name;
- }
-
- private String getDeclaringExtensionName() {
- if (declaringExtension == null) {
- if (element.getDeclaringExtension() == null)
- return ""; //$NON-NLS-1$
- declaringExtension = element.getDeclaringExtension().toString();
- }
- return declaringExtension;
- }
-
- public String getGroupID() {
- return groupID;
- }
-
- IGroupInitializer getInitializerClass() {
- if (groupInterface == null)
- try {
- groupInterface = (IGroupInitializer) element.createExecutableExtension(GROUP_INTIALIZER_CLASS_ATTR);
- } catch (CoreException e) {
- Logger.getLogger().logError(WTPResourceHandler.getString("29", new Object[]{GROUP_INTIALIZER_CLASS_ATTR, getInitalizerClassName(), getDeclaringExtensionName()}) + "\r\n"); //$NON-NLS-1$//$NON-NLS-2$
- Logger.getLogger().logError(e);
- }
- return groupInterface;
- }
-
- public String toString() {
- return "\"" + getName() + "\" (" + getGroupID() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- public int getPriority() {
- if (priority == NEGATIVE_PRIORITY)
- priority = Integer.parseInt(element.getAttribute(GROUP_PRIORITY_ATTR));
- return priority;
- }
-
- public boolean isEnabled(IProject project) {
- if (getInitializerClass() != null)
- return getInitializerClass().isGroupEnabled(project);
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(Object o) {
- if (this.equals(o))
- return 0;
- else if (!(o instanceof FunctionGroup))
- return 1;
-
- FunctionGroup group = (FunctionGroup) o;
- if (getPriority() == group.getPriority())
- return getGroupID().compareTo(group.getGroupID());
-
- else if (getPriority() < group.getPriority())
- return -1;
- else
- return 1;
- }
-
- public boolean isMatch(String string) {
- if (functionGroupPatternBindings == null) {
- if (!errorReported) {
- Logger.getLogger().logError(WTPResourceHandler.getString("30", new Object[]{getGroupID()})); //$NON-NLS-1$
- errorReported = true;
- }
- return false;
- }
- for (Iterator iterator = functionGroupPatternBindings.iterator(); iterator.hasNext();) {
- FunctionGroupPatternBinding functionGroupPatternBinding = (FunctionGroupPatternBinding) iterator.next();
-
- if (functionGroupPatternBinding.getPattern().matcher(string).matches())
- return true;
- }
-
- return false;
- }
-
- boolean setFunctionGroupPatternBindings(Set functionGroupPatternBindings) {
- functionGroupPatternBindings = Util.safeCopy(functionGroupPatternBindings, FunctionGroupPatternBinding.class);
-
- if (!Util.equals(functionGroupPatternBindings, this.functionGroupPatternBindings)) {
- this.functionGroupPatternBindings = functionGroupPatternBindings;
-// this.functionGroupPatternBindingsAsArray = (FunctionGroupPatternBinding[]) this.functionGroupPatternBindings.toArray(new FunctionGroupPatternBinding[this.functionGroupPatternBindings.size()]);
-
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.java
deleted file mode 100644
index d387771..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.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
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.regex.Pattern;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class FunctionGroupPatternBinding {
-
- private final static int HASH_FACTOR = 89;
- private final static int HASH_INITIAL = FunctionGroupPatternBinding.class.getName().hashCode();
- private String functionGroupId;
- private transient int hashCode;
- private transient boolean hashCodeComputed;
- private Pattern pattern;
- private transient String string;
-
- /**
- *
- */
- public FunctionGroupPatternBinding(String functionGroupId, Pattern pattern) {
- if (pattern == null)
- throw new NullPointerException();
-
- this.functionGroupId = functionGroupId;
- this.pattern = pattern;
- }
-
- public int compareTo(Object object) {
- FunctionGroupPatternBinding castedObject = (FunctionGroupPatternBinding) object;
- int compareTo = Util.compare(functionGroupId, castedObject.functionGroupId);
-
- if (compareTo == 0)
- compareTo = Util.compare(pattern.pattern(), castedObject.pattern.pattern());
-
- return compareTo;
- }
-
- public boolean equals(Object object) {
- if (!(object instanceof FunctionGroupPatternBinding))
- return false;
-
- FunctionGroupPatternBinding castedObject = (FunctionGroupPatternBinding) object;
- boolean equals = true;
- equals &= Util.equals(functionGroupId, castedObject.functionGroupId);
- equals &= Util.equals(pattern, castedObject.pattern);
- return equals;
- }
-
- public String getActivityId() {
- return functionGroupId;
- }
-
- public Pattern getPattern() {
- return pattern;
- }
-
- public int hashCode() {
- if (!hashCodeComputed) {
- hashCode = HASH_INITIAL;
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(functionGroupId);
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(pattern);
- hashCodeComputed = true;
- }
-
- return hashCode;
- }
-
- public String toString() {
- if (string == null) {
- final StringBuffer stringBuffer = new StringBuffer();
- stringBuffer.append('[').append(functionGroupId).append(",pattern=\"").append(pattern.pattern()).append("\"]"); //$NON-NLS-1$ //$NON-NLS-2$
- string = stringBuffer.toString();
- }
-
- return string;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java
deleted file mode 100644
index 996c92c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java
+++ /dev/null
@@ -1,255 +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.frameworks.internal.enablement;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-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.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * The FunctionGroupRegistry will consume Configuration elements conforming to the FunctionGroup
- * Extension Point schema.
- *
- * @author mdelder/blancett
- */
-public class FunctionGroupRegistry extends RegistryReader {
-
- private static FunctionGroupRegistry INSTANCE = null;
-
- public static final String GROUP_ELEMENT = "functionGroup"; //$NON-NLS-1$
- public static final String GROUP_ID_ATTR = "functionGroupID"; //$NON-NLS-1$
- public static final String FUNCTION_GROUP_PATTERN_BINDING_ELMT = "functionGroupPatternBinding"; //$NON-NLS-1$
- public static final String PATTERN_ATTR = "pattern"; //$NON-NLS-1$
-
- private Map groupMapById;
- private List knownGroups;
- private Map patternBindingsByGroupId;
-
- private FunctionGroupRegistry() {
- super(WTPCommonPlugin.PLUGIN_ID, WTPCommonPlugin.GROUP_REGISTRY_EXTENSION_POINT);
- patternBindingsByGroupId = new HashMap();
-
- }
-
- public static FunctionGroupRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new FunctionGroupRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /*
- * (non-Javadoc) Read all the elements first, then set the pattern bindings on the function
- * groups
- */
- public void readRegistry() {
- super.readRegistry();
- setPatternBindings();
- }
-
- private void setPatternBindings() {
- Iterator iter = patternBindingsByGroupId.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Entry) iter.next();
- String groupId = (String) entry.getKey();
- Set value = (Set) entry.getValue();
- FunctionGroup aGroup = getGroupByID(groupId);
- if (aGroup != null)
- aGroup.setFunctionGroupPatternBindings(value);
- }
-
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals(GROUP_ELEMENT)) {
- readGroup(element);
- return true;
- } else if (element.getName().equals(FUNCTION_GROUP_PATTERN_BINDING_ELMT)) {
- readPatternBinding(element);
- return true;
- }
- return false;
- }
-
- /**
- * @param element
- */
- private void readPatternBinding(IConfigurationElement element) {
- String groupID = element.getAttribute(GROUP_ID_ATTR);
- String pattern = element.getAttribute(PATTERN_ATTR);
- if (!isNullOrEmpty(groupID) && !isNullOrEmpty(pattern)) {
- Pattern aPattern = Pattern.compile(pattern);
- FunctionGroupPatternBinding binding = new FunctionGroupPatternBinding(groupID, aPattern);
- addPatternBinding(groupID, binding);
- }
-
- }
-
- /**
- * @param binding
- */
- private void addPatternBinding(String groupID, FunctionGroupPatternBinding binding) {
- Set bindings = (Set) patternBindingsByGroupId.get(groupID);
- if (bindings == null) {
- bindings = new HashSet();
- patternBindingsByGroupId.put(groupID, bindings);
- }
- bindings.add(binding);
- }
-
- private boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- private void readGroup(IConfigurationElement element) {
- String groupID = element.getAttribute(GROUP_ID_ATTR);
- if (!isNullOrEmpty(groupID)) {
- FunctionGroup group = new FunctionGroup(groupID, element);
- getGroupMapById().put(groupID, group);
- getKnownGroups().add(group);
- }
- }
-
- private List getAscendingSortedGroups(IProject project) {
- Comparator ascendingGrpComparator = AscendingGroupComparator.singleton();
- List groupList = getKnownGroups(project);
- Collections.sort(groupList, ascendingGrpComparator);
- return groupList;
- }
-
- private List getDescendingSortedGroups(IProject project) {
- Comparator descendingGrpComparator = DescendingGroupComparator.singleton();
- List groupList = getKnownGroups(project);
- Collections.sort(groupList, descendingGrpComparator);
- return groupList;
- }
-
- public List getKnownGroups(IProject project) {
- ArrayList groupByProjectList = new ArrayList(getKnownGroups().size());
- List groupList = getKnownGroups();
- for (int i = 0; i < groupList.size(); i++) {
- FunctionGroup group = (FunctionGroup) groupList.get(i);
- if (group.isEnabled(project))
- groupByProjectList.add(group);
- }
- return groupByProjectList;
- }
-
- public List getAscendingPriorityGroupNames(IProject project) {
- List sortedGroup = getAscendingSortedGroups(project);
- return getGroupListNames(sortedGroup, new ArrayList(sortedGroup.size()));
-
- }
-
- public List getDescendingPriorityGroupNames(IProject project) {
- List sortedGroup = getDescendingSortedGroups(project);
- return getGroupListNames(sortedGroup, new ArrayList(sortedGroup.size()));
- }
-
- private List getGroupListNames(List sortedGroup, List sortedGroupNames) {
- for (int i = 0; i < sortedGroup.size(); i++) {
- FunctionGroup grp = (FunctionGroup) sortedGroup.get(i);
- sortedGroupNames.add(grp.getGroupID());
- }
- return sortedGroupNames;
- }
-
- public Iterator getGroupIDs() {
- return getGroupMapById().keySet().iterator();
- }
-
- public FunctionGroup getGroupByID(String groupID) {
- return (FunctionGroup) getGroupMapById().get(groupID);
- }
-
- public boolean isGroupEnabled(IProject project, String groupID) {
- FunctionGroup group = getGroupByID(groupID);
- if (group != null)
- return group.isEnabled(project);
- return false;
- }
-
- public List getKnownGroups() {
- if (knownGroups == null)
- knownGroups = new ArrayList();
- return knownGroups;
- }
-
- /**
- * @return Returns the groupMapById.
- */
- protected Map getGroupMapById() {
- if (groupMapById == null)
- groupMapById = new HashMap();
- return groupMapById;
- }
-
- /**
- * Check the priority of the two groups referenced by
- *
- * @groupID1 and
- * @groupID2
- *
- * @param groupID1
- * @param groupID2
- * @return 0 if the two groups are equal, 1 if
- * @groupID1 has a higher precedence, otherwise -1
- */
- public int compare(String groupID1, String groupID2) {
- FunctionGroup group1 = getGroupByID(groupID1);
- FunctionGroup group2 = getGroupByID(groupID2);
- if (group1 == null) {
- Logger.getLogger().logError(new IllegalArgumentException(WTPResourceHandler.getString("28", new Object[]{groupID1}))); //$NON-NLS-1$
- return -1;
- }
- if (group2 == null) {
- Logger.getLogger().logError(new IllegalArgumentException(WTPResourceHandler.getString("28", new Object[]{groupID2}))); //$NON-NLS-1$
- return 1;
- }
-
- return group1.compareTo(group2);
- }
-
- public int getGroupPriority(String grpId) {
- FunctionGroup group = getGroupByID(grpId);
- return (group != null) ? group.getPriority() : -1;
- }
-
- public int getFunctionPriority(String enablementID) {
- int priority = Integer.MAX_VALUE;
- Iterator iter = getKnownGroups().iterator();
- while (iter.hasNext()) {
- FunctionGroup group = (FunctionGroup) iter.next();
- if (group.isMatch(enablementID))
- priority = Math.min(priority, group.getPriority());
- }
- return priority;
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java
deleted file mode 100644
index d73d812..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java
+++ /dev/null
@@ -1,82 +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 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.Set;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementIdentifier {
-
-
- /**
- * Registers an instance of <code>IIdentifierListener</code> to listen for changes to
- * properties of this instance.
- *
- * @param identifierListener
- * the instance to register. Must not be <code>null</code>. If an attempt is made
- * to register an instance which is already registered with this instance, no
- * operation is performed.
- */
- void addIdentifierListener(IEnablementIdentifierListener identifierListener);
-
- /**
- * Returns the set of function group ids that this instance matches.
- * <p>
- * Notification is sent to all registered listeners if this property changes.
- * </p>
- *
- * @return the set of activity ids that this instance matches. This set may be empty, but is
- * guaranteed not to be <code>null</code>. If this set is not empty, it is guaranteed
- * to only contain instances of <code>String</code>.
- */
- Set getFunctionGroupIds();
-
- /**
- * Returns the identifier of this instance.
- *
- * @return the identifier of this instance. Guaranteed not to be <code>null</code>.
- */
- String getId();
-
- /**
- * Returns whether or not this instance is enabled.
- * <p>
- * Notification is sent to all registered listeners if this property changes.
- * </p>
- *
- * @return true, iff this instance is enabled.
- */
- boolean isEnabled();
-
- /**
- * Unregisters an instance of <code>IEnablementIdentifierListener</code> listening for changes
- * to properties of this instance.
- *
- * @param identifierListener
- * the instance to unregister. Must not be <code>null</code>. If an attempt is
- * made to unregister an instance which is not already registered with this instance,
- * no operation is performed.
- */
- void removeIdentifierListener(IEnablementIdentifierListener identifierListener);
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java
deleted file mode 100644
index 90cf938..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java
+++ /dev/null
@@ -1,34 +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 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementIdentifierListener {
- /**
- * Notifies that one or more properties of an instance of <code>IIdentifier</code> have
- * changed. Specific details are described in the <code>IdentifierEvent</code>.
- *
- * @param identifierEvent
- * the identifier event. Guaranteed not to be <code>null</code>.
- */
- void identifierChanged(EnablementIdentifierEvent identifierEvent);
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementManager.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementManager.java
deleted file mode 100644
index 454c94c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IEnablementManager.java
+++ /dev/null
@@ -1,59 +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 12, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.UIContextDetermination;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementManager {
- String INTERNAL_ENABLEMENT_DETERMINATION_ID = "org.eclipse.wst.common.frameworks.internal.EnablementDetermination"; //$NON-NLS-1$
-
- IEnablementManager INSTANCE = (IEnablementManager) UIContextDetermination.createInstance(INTERNAL_ENABLEMENT_DETERMINATION_ID);
-
- IEnablementIdentifier getIdentifier(String identifierId, IProject project);
-
- /**
- * Notify all identifier listeners that the state of a project has changed that affects the
- * enablement of a group for a project. This method is fail safe, in that if one listener throws
- * an exception while being notified, it will not stop the notification of other listeners.
- *
- * @param evt
- * @throws CoreException
- * if exceptions were caught notifying any of the listeners. Check the status of the
- * core exception for the nested exceptions.
- */
- void notifyFunctionGroupChanged(String groupID, IProject project) throws CoreException;
-
- /**
- * Utility method for clients to dispose of listeners
- *
- * @param enablementIdentifiers
- * @param listener
- */
- void removeEnablementIdentifierListener(Collection enablementIdentifiers, IEnablementIdentifierListener listener);
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IGroupInitializer.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IGroupInitializer.java
deleted file mode 100644
index c1cdc9c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IGroupInitializer.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
- *******************************************************************************/
-/*
- * Created on Dec 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface IGroupInitializer {
-
- public boolean isGroupEnabled(IProject project);
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Identifiable.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Identifiable.java
deleted file mode 100644
index bd364b9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Identifiable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.enablement;
-
-
-/**
- * @author mdelder
- *
- */
-public interface Identifiable {
-
- /**
- * return id that uniquely identifies this instance of an extension point. It is up to each
- * individual extension point provider to decide what that might be (e.g., "editorID", "pageID",
- * etc.
- */
- String getID();
-
- /**
- *
- * @return the order the Identifiable element was loaded
- */
- int getLoadOrder();
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IdentifiableComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IdentifiableComparator.java
deleted file mode 100644
index 0df26cf..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/IdentifiableComparator.java
+++ /dev/null
@@ -1,77 +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.frameworks.internal.enablement;
-
-
-/**
- * @author mdelder
- *
- */
-public class IdentifiableComparator implements java.util.Comparator {
-
- protected static final int GREATER_THAN = 1;
-
- protected static final int LESS_THAN = -1;
-
- protected static final int EQUAL = 0;
-
- protected static final IdentifiableComparator instance = new IdentifiableComparator();
-
- private static final int DEFAULT_PRIORITY = Integer.MAX_VALUE;
-
- public static IdentifiableComparator getInstance() {
- return instance;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- Identifiable lvalue = null;
- Identifiable rvalue = null;
- if (o1 instanceof Identifiable)
- lvalue = (Identifiable) o1;
- if (o2 instanceof Identifiable)
- rvalue = (Identifiable) o2;
-
- if (rvalue == null)
- return GREATER_THAN;
- if (lvalue == null)
- return LESS_THAN;
-
- if ((lvalue.getID() == null && rvalue.getID() == null) || (getPriority(lvalue) == getPriority(rvalue)))
- return compareLoadOrder(lvalue, rvalue);
- /* R - L implies 0 is the highest priority */
- return getPriority(lvalue) - getPriority(rvalue);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return obj instanceof IdentifiableComparator;
- }
-
- private int compareLoadOrder(Identifiable lvalue, Identifiable rvalue) {
- /* R - L implies 0 is the highest priority */
- return lvalue.getLoadOrder() - rvalue.getLoadOrder();
- }
-
- public int getPriority(Identifiable identifiable) {
- if (identifiable.getID() != null && identifiable.getID().length() > 0)
- return FunctionGroupRegistry.getInstance().getFunctionPriority(identifiable.getID());
- return DEFAULT_PRIORITY;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Util.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Util.java
deleted file mode 100644
index 740270a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/enablement/Util.java
+++ /dev/null
@@ -1,354 +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.frameworks.internal.enablement;
-
-import java.util.ArrayList;
-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.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-/*
- * Rename this class to EnablementsUtil
- */
-
-public final class Util {
- public final static SortedMap EMPTY_SORTED_MAP = Collections.unmodifiableSortedMap(new TreeMap());
- public final static SortedSet EMPTY_SORTED_SET = Collections.unmodifiableSortedSet(new TreeSet());
- public final static String ZERO_LENGTH_STRING = ""; //$NON-NLS-1$
-
- public static void assertInstance(Object object, Class c) {
- assertInstance(object, c, false);
- }
-
- public static void assertInstance(Object object, Class c, boolean allowNull) {
- if (object == null && allowNull)
- return;
-
- if (object == null || c == null)
- throw new NullPointerException();
- else if (!c.isInstance(object))
- throw new IllegalArgumentException();
- }
-
- public static int compare(boolean left, boolean right) {
- return left == false ? (right == true ? -1 : 0) : 1;
- }
-
- public static int compare(Comparable left, Comparable right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else
- return left.compareTo(right);
- }
-
- public static int compare(Comparable[] left, Comparable[] right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else {
- int l = left.length;
- int r = right.length;
-
- if (l != r)
- return l - r;
- for (int i = 0; i < l; i++) {
- int compareTo = compare(left[i], right[i]);
-
- if (compareTo != 0)
- return compareTo;
- }
- return 0;
- }
- }
-
- public static int compare(int left, int right) {
- return left - right;
- }
-
- public static int compare(List left, List right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else {
- int l = left.size();
- int r = right.size();
-
- if (l != r)
- return l - r;
- for (int i = 0; i < l; i++) {
- int compareTo = compare((Comparable) left.get(i), (Comparable) right.get(i));
-
- if (compareTo != 0)
- return compareTo;
- }
- return 0;
- }
- }
-
- public static void diff(Map left, Map right, Set leftOnly, Set different, Set rightOnly) {
- if (left == null || right == null || leftOnly == null || different == null || rightOnly == null)
- throw new NullPointerException();
-
- Iterator iterator = left.keySet().iterator();
-
- while (iterator.hasNext()) {
- Object key = iterator.next();
-
- if (!right.containsKey(key))
- leftOnly.add(key);
- else if (!Util.equals(left.get(key), right.get(key)))
- different.add(key);
- }
-
- iterator = right.keySet().iterator();
-
- while (iterator.hasNext()) {
- Object key = iterator.next();
-
- if (!left.containsKey(key))
- rightOnly.add(key);
- }
- }
-
- public static void diff(Set left, Set right, Set leftOnly, Set rightOnly) {
- if (left == null || right == null || leftOnly == null || rightOnly == null)
- throw new NullPointerException();
-
- Iterator iterator = left.iterator();
-
- while (iterator.hasNext()) {
- Object object = iterator.next();
-
- if (!right.contains(object))
- leftOnly.add(object);
- }
-
- iterator = right.iterator();
-
- while (iterator.hasNext()) {
- Object object = iterator.next();
-
- if (!left.contains(object))
- rightOnly.add(object);
- }
- }
-
- public static boolean endsWith(List left, List right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.size();
- int r = right.size();
- if (r > l || !equals && r == l)
- return false;
-
- for (int i = 0; i < r; i++)
- if (!equals(left.get(l - i - 1), right.get(r - i - 1)))
- return false;
- return true;
- }
-
- public static boolean endsWith(Object[] left, Object[] right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.length;
- int r = right.length;
- if (r > l || !equals && r == l)
- return false;
- for (int i = 0; i < r; i++)
- if (!equals(left[l - i - 1], right[r - i - 1]))
- return false;
- return true;
- }
-
- public static boolean equals(boolean left, boolean right) {
- return left == right;
- }
-
- public static boolean equals(int left, int right) {
- return left == right;
- }
-
- public static boolean equals(Object left, Object right) {
- return left == null ? right == null : left.equals(right);
- }
-
- public static int hashCode(boolean b) {
- return b ? Boolean.TRUE.hashCode() : Boolean.FALSE.hashCode();
- }
-
- public static int hashCode(int i) {
- return i;
- }
-
- public static int hashCode(Object object) {
- return object != null ? object.hashCode() : 0;
- }
-
- public static List safeCopy(List list, Class c) {
- return safeCopy(list, c, false);
- }
-
- public static List safeCopy(List list, Class c, boolean allowNullElements) {
- if (list == null || c == null)
- throw new NullPointerException();
-
- list = Collections.unmodifiableList(new ArrayList(list));
- Iterator iterator = list.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return list;
- }
-
- public static Map safeCopy(Map map, Class keyClass, Class valueClass) {
- return safeCopy(map, keyClass, valueClass, false, false);
- }
-
- public static Map safeCopy(Map map, Class keyClass, Class valueClass, boolean allowNullKeys, boolean allowNullValues) {
- if (map == null || keyClass == null || valueClass == null)
- throw new NullPointerException();
-
- map = Collections.unmodifiableMap(new HashMap(map));
- Iterator iterator = map.entrySet().iterator();
-
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- assertInstance(entry.getKey(), keyClass, allowNullKeys);
- assertInstance(entry.getValue(), valueClass, allowNullValues);
- }
-
- return map;
- }
-
- public static Set safeCopy(Set set, Class c) {
- return safeCopy(set, c, false);
- }
-
- public static Set safeCopy(Set set, Class c, boolean allowNullElements) {
- if (set == null || c == null)
- throw new NullPointerException();
-
- set = Collections.unmodifiableSet(new HashSet(set));
- Iterator iterator = set.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return set;
- }
-
- public static SortedMap safeCopy(SortedMap sortedMap, Class keyClass, Class valueClass) {
- return safeCopy(sortedMap, keyClass, valueClass, false, false);
- }
-
- public static SortedMap safeCopy(SortedMap sortedMap, Class keyClass, Class valueClass, boolean allowNullKeys, boolean allowNullValues) {
- if (sortedMap == null || keyClass == null || valueClass == null)
- throw new NullPointerException();
-
- sortedMap = Collections.unmodifiableSortedMap(new TreeMap(sortedMap));
- Iterator iterator = sortedMap.entrySet().iterator();
-
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- assertInstance(entry.getKey(), keyClass, allowNullKeys);
- assertInstance(entry.getValue(), valueClass, allowNullValues);
- }
-
- return sortedMap;
- }
-
- public static SortedSet safeCopy(SortedSet sortedSet, Class c) {
- return safeCopy(sortedSet, c, false);
- }
-
- public static SortedSet safeCopy(SortedSet sortedSet, Class c, boolean allowNullElements) {
- if (sortedSet == null || c == null)
- throw new NullPointerException();
-
- sortedSet = Collections.unmodifiableSortedSet(new TreeSet(sortedSet));
- Iterator iterator = sortedSet.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return sortedSet;
- }
-
- public static boolean startsWith(List left, List right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.size();
- int r = right.size();
- if (r > l || !equals && r == l)
- return false;
- for (int i = 0; i < r; i++)
- if (!equals(left.get(i), right.get(i)))
- return false;
- return true;
- }
-
- public static boolean startsWith(Object[] left, Object[] right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.length;
- int r = right.length;
- if (r > l || !equals && r == l)
- return false;
-
- for (int i = 0; i < r; i++)
- if (!equals(left[i], right[i]))
- return false;
- return true;
- }
-
- public static String translateString(ResourceBundle resourceBundle, String key) {
- return Util.translateString(resourceBundle, key, key, true, true);
- }
-
- public static String translateString(ResourceBundle resourceBundle, String key, String string, boolean signal, boolean trim) {
- if (resourceBundle != null && key != null)
- try {
- final String translatedString = resourceBundle.getString(key);
-
- if (translatedString != null)
- return trim ? translatedString.trim() : translatedString;
- } catch (MissingResourceException eMissingResource) {
- if (signal)
- System.err.println(eMissingResource);
- }
-
- return trim ? string.trim() : string;
- }
-
- private Util() {
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java
deleted file mode 100644
index 8b754b5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java
+++ /dev/null
@@ -1,94 +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.frameworks.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-
-public class ComposedExtendedOperationHolder {
-
- private ArrayList preOps = null;
- private ArrayList postOps = null;
-
- protected ComposedExtendedOperationHolder() {
- super();
- }
-
- public static ComposedExtendedOperationHolder createExtendedOperationHolder(String operationID) {
- Collection extensions = (Collection) OperationExtensionReader.getExtensionPoints().get(operationID);
- if (extensions == null) {
- return null;
- }
-
- ComposedExtendedOperationHolder extOperationHolder = new ComposedExtendedOperationHolder();
- Object preOp = null;
- Object postOp = null;
- OperationExtension currentExt = null;
- for (Iterator iterator = extensions.iterator(); iterator.hasNext();) {
- currentExt = (OperationExtension) iterator.next();
- if (EnablementManager.INSTANCE.getIdentifier(currentExt.getExtensionId(), null).isEnabled()) {
- try {
- preOp = currentExt.getPreOperation();
- if (preOp != null) {
- extOperationHolder.addPreOperation(preOp);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- try {
- postOp = currentExt.getPostOperation();
- if (postOp != null) {
- extOperationHolder.addPostOperation(postOp);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- return extOperationHolder;
- }
-
- protected void addPreOperation(Object preOperation) {
- if (preOps == null) {
- preOps = new ArrayList();
- }
- preOps.add(preOperation);
- }
-
- protected void addPostOperation(Object postOperation) {
- if (postOps == null) {
- postOps = new ArrayList();
- }
- postOps.add(postOperation);
- }
-
- public boolean hasPreOps() {
- return preOps != null;
- }
-
- public boolean hasPostOps() {
- return postOps != null;
- }
-
- public ArrayList getPostOps() {
- return postOps;
- }
-
- public ArrayList getPreOps() {
- return preOps;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java
deleted file mode 100644
index 35db85c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java
+++ /dev/null
@@ -1,42 +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.frameworks.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Simialar to org.eclipse.jface.operation.IRunnableWithProgress, however without UI dependencies.
- *
- * This class is EXPERIMENTAL and is subject to substantial changes.
- */
-public interface IHeadlessRunnableWithProgress {
- /**
- * Runs this operation without forcing a UI dependency.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive requests for
- * cancelation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception, it should wrap it inside
- * an <code>InvocationTargetException</code>; runtime exceptions are
- * automatically wrapped in an <code>InvocationTargetException</code> by the
- * calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableWithProgress
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java
deleted file mode 100644
index 633e4c1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java
+++ /dev/null
@@ -1,57 +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.common.frameworks.internal.operations;
-
-/**
- * Passed to complex methods that may require reporting of messages, or interactions from the user;
- * Defined as an interface because the actions may run in headless environments
- */
-public interface IOperationHandler {
- int YES = 0;
- int YES_TO_ALL = 1;
- int NO = 2;
- int CANCEL = 3;
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message);
-
- /**
- * A decision needs to made as to whether an action/operation can continue. <code>items</code>
- * is an array of details that accompany the <code>message</code>.
- */
- public boolean canContinue(String message, String[] items);
-
- /**
- * A decision needs to made as to whether an action/operation can continue. The boolean array
- * will return two booleans. The first indicates their response to the original question and the
- * second indicates if they selected the apply to all check box.
- *
- * Return the return code for the dialog. 0 = Yes, 1 = Yes to all, 2 = No
- */
- int canContinueWithAllCheck(String message);
-
- int canContinueWithAllCheckAllowCancel(String message);
-
- /**
- * An error has occurred
- */
- public void error(String message);
-
- /**
- * An informational message needs to be presented
- */
- public void inform(String message);
-
- public Object getContext();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationProperties.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationProperties.java
deleted file mode 100644
index c08786a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationProperties.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated IProjectCreationPropertiesNew
- */
-public interface IProjectCreationProperties extends DoNotUseMeThisWillBeDeletedPost15{
-
- /**
- * A required dataModel propertyName for a <code>java.lang.String</code> type. This is used to
- * specify the project name.
- */
- public static final String PROJECT_NAME = "IProjectCreationProperties.PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * An optonal dataModel propertyName for a <code>java.lang.String</code> type. Sets the local
- * file system location for the described project. The path must be either an absolute file
- * system path, or a relative path whose first segment is the name of a defined workspace path
- * variable. The default value is the workspace's default location.
- */
- public static final String PROJECT_LOCATION = "IProjectCreationProperties.PROJECT_LOCATION"; //$NON-NLS-1$
-
-
- /**
- * An optional dataModel propertyName for a <code>java.lang.String[]</code> type. This is a
- * list of all natures to add to the project. There is no default value.
- */
- public static final String PROJECT_NATURES = "IProjectCreationProperties.PROJECT_NATURES"; //$NON-NLS-1$
-
- /**
- * IProject. An non settable property. This is a conveniece for constructiong getting the
- * IProject
- */
- public static final String PROJECT = "IProjectCreationProperties.PROJECT"; //$NON-NLS-1$
-
- /**
- * IProjectDescription. An non settable property. This is a conveniece for constructiong a
- * project description.
- */
- public static final String PROJECT_DESCRIPTION = "IProjectCreationProperties.PROJECT_DESCRIPTION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationPropertiesNew.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationPropertiesNew.java
deleted file mode 100644
index 8b36cd7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IProjectCreationPropertiesNew.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-public interface IProjectCreationPropertiesNew {
-
- /**
- * A required dataModel propertyName for a <code>java.lang.String</code> type. This is used to
- * specify the project name.
- */
- public static final String PROJECT_NAME = "IProjectCreationPropertiesNew.PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * A Boolean property used for determining how the PROJECT_LOCATION is computed. If this
- * property is true then the PROJECT_LOCATION is null. Otherwise the PROJECT_LOCATION is the
- * value of USER_DEFINED_LOCATION.
- */
- public static final String USE_DEFAULT_LOCATION = "IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION"; //$NON-NLS-1$
-
- /**
- * A String property used in conjuction with USE_DEFAULT_LOCATION to override the
- * DEFAULT_LOCATION.
- */
- public static final String USER_DEFINED_LOCATION = "IProjectCreationPropertiesNew.USER_DEFINED_LOCATION"; //$NON-NLS-1$
-
- /**
- * A String property used in conjunction with {@link #USE_DEFAULT_LOCATION} and
- * {@link #PROJECT_NAME} to overrid the {@link #PROJECT_LOCATION}.
- *
- * If {@link #USE_DEFAULT_LOCATION} is <code>false</code> and this property is set, then the
- * {@link #PROJECT_LOCATION} is defined by {@link #USER_DEFINED_BASE_LOCATION}/{@link #PROJECT_NAME}.
- */
- public static final String USER_DEFINED_BASE_LOCATION = "IProjectCreationPropertiesNew.USER_DEFINED_BASE_LOCATION"; //$NON-NLS-1$
-
- /**
- * An unsettable property which specified the default location for a newly created project. The
- * value is computed by appending the project name to the workspace location.
- */
- public static final String DEFAULT_LOCATION = "IProjectCreationPropertiesNew.DEFAULT_LOCATION"; //$NON-NLS-1$
-
- /**
- * An unsettable property used to specify the project location. If USE_DEFAULT_LOCATION this
- * property evaluates to USER_DEFINED_LOCATION; otherwise it i <code>null</code>.
- */
- public static final String PROJECT_LOCATION = "IProjectCreationPropertiesNew.PROJECT_LOCATION"; //$NON-NLS-1$
-
- /**
- * An optional dataModel propertyName for a <code>java.lang.String[]</code> type. This is a
- * list of all natures to add to the project. There is no default value.
- */
- public static final String PROJECT_NATURES = "IProjectCreationPropertiesNew.PROJECT_NATURES"; //$NON-NLS-1$
-
- /**
- * IProject. An non settable property. This is a conveniece for constructiong getting the
- * IProject
- */
- public static final String PROJECT = "IProjectCreationPropertiesNew.PROJECT"; //$NON-NLS-1$
-
- /**
- * IProjectDescription. An non settable property. This is a conveniece for constructiong a
- * project description.
- */
- public static final String PROJECT_DESCRIPTION = "IProjectCreationPropertiesNew.PROJECT_DESCRIPTION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java
deleted file mode 100644
index 2fcd16e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java
+++ /dev/null
@@ -1,77 +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.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class OperationExtension {
-
- protected String opID = null;
-
- protected IConfigurationElement baseElement = null;
-
- protected String preOperationClass = null;
-
- protected String postOperationClass = null;
-
- protected String extensionId;
-
- public OperationExtension(IConfigurationElement element, String id, String preOp, String postOp) {
- super();
- baseElement = element;
- setUpExtension(id, preOp, postOp);
- }
-
- private void setUpExtension(String id, String preOp, String postOp) {
- opID = id;
- preOperationClass = preOp;
- postOperationClass = postOp;
- this.extensionId = baseElement.getDeclaringExtension().getUniqueIdentifier();
- if (this.extensionId == null)
- this.extensionId = baseElement.getDeclaringExtension().getNamespace();
- }
-
- public String getOpID() {
- return opID;
- }
-
- public String getPostOperationClass() {
- return postOperationClass;
- }
-
- public String getPreOperationClass() {
- return preOperationClass;
- }
-
- public Object getPostOperation() throws CoreException {
- if (postOperationClass == null)
- return null;
- return baseElement.createExecutableExtension(OperationExtensionReader.ATT_POST_OP);
- }
-
- public Object getPreOperation() throws CoreException {
- if (preOperationClass == null)
- return null;
- return baseElement.createExecutableExtension(OperationExtensionReader.ATT_PRE_OP);
- }
-
- /**
- * @return Returns the extensionId.
- */
- public String getExtensionId() {
- return extensionId;
- }
-
- public IConfigurationElement getBaseElement() {
- return baseElement;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java
deleted file mode 100644
index 31f25db..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java
+++ /dev/null
@@ -1,83 +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 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.frameworks.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class OperationExtensionReader extends RegistryReader {
- protected static HashMap opExtensions = null;
-
- public static final String ELEMENT_J2EEOPEXT = "operationExtension"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_PRE_OP = "preOperationClass"; //$NON-NLS-1$
- public static final String ATT_POST_OP = "postOperationClass"; //$NON-NLS-1$
-
- public OperationExtensionReader() {
- super(WTPCommonPlugin.PLUGIN_ID, "OperationExtension"); //$NON-NLS-1$
- }
-
- /**
- * readElement() - parse and deal with an extension like: <operationExtension
- * preOperationClass="com.ibm.etools....PreDeleteOperation"
- * postOperationClass="com.ibm.etools....PostDeleteOperation"> </operationExtension>
- */
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_J2EEOPEXT))
- return false;
- String id = element.getAttribute(ATT_ID);
- String preOp = element.getAttribute(ATT_PRE_OP);
- String postOp = element.getAttribute(ATT_POST_OP);
- OperationExtension extension = new OperationExtension(element, id, preOp, postOp);
- addExtensionPoint(extension);
- return true;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- private static void addExtensionPoint(OperationExtension newExtension) {
- Collection temp = null;
- Object holder = opExtensions.get(newExtension.getOpID());
- if (holder == null) {
- temp = new ArrayList();
- temp.add(newExtension);
- opExtensions.put(newExtension.getOpID(), temp);
- } else {
- temp = (Collection) holder;
- temp.add(newExtension);
- }
- }
-
- public static HashMap getExtensionPoints() {
- if(opExtensions == null){
- opExtensions = new HashMap();
- OperationExtensionReader opExtensionReader = new OperationExtensionReader();
- opExtensionReader.readRegistry();
- }
- return opExtensions;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java
deleted file mode 100644
index d90a4c8..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java
+++ /dev/null
@@ -1,75 +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.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class OperationStatus extends MultiStatus {
-
- public OperationStatus(String message, Throwable e) {
- super(WTPCommonPlugin.PLUGIN_ID, 0, new IStatus[]{}, message, e);
- }
-
- public OperationStatus(IStatus[] children) {
- this(WTPCommonPlugin.PLUGIN_ID, 0, children, "", null); //$NON-NLS-1$
- }
-
- public OperationStatus(String pluginId, int code, IStatus[] children, String message, Throwable exception) {
- super(pluginId, code, children, message, exception);
- }
-
- public void addExtendedStatus(IStatus status) {
- int oldSeverity = getSeverity();
- super.add(status);
- if (oldSeverity != IStatus.ERROR && getSeverity() == IStatus.ERROR) {
- setSeverity(IStatus.WARNING);
- }
- }
-
- /**
- * Overridden to expose as public instead of protected
- */
- public void setCode(int code) {
- super.setCode(code);
- }
-
- /**
- * Overridden to expose as public instead of protected
- */
- public void setException(Throwable exception) {
- super.setException(exception);
- }
-
- /**
- * Overridden to expose as public instead of protected
- */
- public void setMessage(String message) {
- super.setMessage(message);
- }
-
- /**
- * Overridden to expose as public instead of protected
- */
- public void setSeverity(int severity) {
- super.setSeverity(severity);
- }
-
- public void add(IStatus status) {
- int newSev = status.getSeverity();
- if (newSev > getSeverity()) {
- setMessage(status.getMessage());
- setException(status.getException());
- }
- super.add(status);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProvider.java
deleted file mode 100644
index 9277b6d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,204 +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 27, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.io.File;
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.Resource;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @deprecated use ProjectCreationDataModelProviderNew instead.
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated
- *
- * @see ProjectCreationDataModelProviderNew
- */
-public class ProjectCreationDataModelProvider extends AbstractDataModelProvider implements IProjectCreationProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
- public IDataModelOperation getDefaultOperation() {
- return new ProjectCreationOperation(model);
- }
-
- public void init() {
- super.init();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT);
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(PROJECT_LOCATION);
- propertyNames.add(PROJECT_NATURES);
- propertyNames.add(PROJECT_DESCRIPTION);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(PROJECT_LOCATION))
- return getDefaultLocation();
- else if (propertyName.equals(PROJECT_DESCRIPTION))
- return getProjectDescription();
- return super.getDefaultProperty(propertyName);
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyValue != null && propertyName.equals(PROJECT_LOCATION)) {
- IPath path = getRootLocation();
- if (path.equals(new Path((String) propertyValue))) {
- model.setProperty(propertyName, null);
- }
- model.setProperty(PROJECT_DESCRIPTION, getProjectDescription());
- } else if (propertyName.equals(PROJECT_NAME)) {
- IStatus stat = model.validateProperty(PROJECT_NAME);
- if (stat != OK_STATUS)
- return false;
- model.setProperty(PROJECT, getProject());
- model.setProperty(PROJECT_DESCRIPTION, getProjectDescription());
- }
- return true;
- }
-
- private String getDefaultLocation() {
- IPath path = getRootLocation();
- String projectName = (String) getProperty(PROJECT_NAME);
- if (projectName != null)
- path = path.append(projectName);
- return path.toOSString();
- }
-
- private IPath getRootLocation() {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation();
- }
-
- private IProjectDescription getProjectDescription() {
- String projectName = (String) getProperty(PROJECT_NAME);
- IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
- if (getDataModel().isPropertySet(PROJECT_LOCATION)) {
- String projectLocation = (String) getProperty(IProjectCreationProperties.PROJECT_LOCATION);
- if (projectLocation != null)
- desc.setLocation(new Path(projectLocation));
- else
- desc.setLocation(null);
- }
- return desc;
- }
-
- protected IProject getProject() {
- String projectName = (String) getProperty(PROJECT_NAME);
- return (null != projectName && projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(PROJECT_NAME)) {
- IStatus status = validateName();
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION)) {
- IStatus status = validateLocation();
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION) || propertyName.equals(PROJECT_NAME)) {
- String projectName = getStringProperty(PROJECT_NAME);
- String projectLoc = getStringProperty(PROJECT_LOCATION);
- return validateExisting(projectName, projectLoc);
- }
- return OK_STATUS;
- }
-
- /**
- * @param projectName
- * @param projectLoc
- * @todo Generated comment
- */
- private IStatus validateExisting(String projectName, String projectLoc) {
- if (projectName != null && !projectName.equals("")) {//$NON-NLS-1$
- File file = new File(projectLoc);
- if (file.exists()) {
- if (file.isDirectory()) {
- File dotProject = new File(file, ".project");//$NON-NLS-1$
- if (dotProject.exists()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_AT_LOCATION_ERROR, new Object[]{file.toString()}));
- }
- }
- }
- }
- return OK_STATUS;
- }
-
- public static IProject getProjectHandleFromProjectName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- return (null != projectName && projectName.length() > 0 && status.isOK()) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- public static IStatus validateProjectName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- if (!status.isOK())
- return status;
- return OK_STATUS;
- }
-
- private IStatus validateName() {
- String name = getStringProperty(PROJECT_NAME);
- IStatus status = validateProjectName(name);
- if (!status.isOK())
- return status;
- if (getProject().exists())
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_ERROR, new Object[]{name}));
-
- if (!WTPPlugin.isPlatformCaseSensitive()) {
- // now look for a matching case variant in the tree
- IResource variant = ((Resource) getProject()).findExistingResourceVariant(getProject().getFullPath());
- if (variant != null) {
- // TODO Fix this string
- return WTPCommonPlugin.createErrorStatus("Resource already exists with a different case."); //$NON-NLS-1$
- }
- }
- return OK_STATUS;
- }
-
- private IStatus validateLocation() {
- if (getDataModel().isPropertySet(PROJECT_LOCATION)) {
- String loc = (String) getProperty(PROJECT_LOCATION);
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(loc);
- return workspace.validateProjectLocation(getProject(), path);
- }
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProviderNew.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProviderNew.java
deleted file mode 100644
index 3823ed7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModelProviderNew.java
+++ /dev/null
@@ -1,210 +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.frameworks.internal.operations;
-
-import java.io.File;
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.Resource;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class ProjectCreationDataModelProviderNew extends AbstractDataModelProvider implements IProjectCreationPropertiesNew {
-
- public IDataModelOperation getDefaultOperation() {
- return new ProjectCreationOperationNew(model);
- }
-
- public void init() {
- super.init();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT);
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(PROJECT_LOCATION);
- propertyNames.add(USE_DEFAULT_LOCATION);
- propertyNames.add(DEFAULT_LOCATION);
- propertyNames.add(USER_DEFINED_LOCATION);
- propertyNames.add(USER_DEFINED_BASE_LOCATION);
- propertyNames.add(PROJECT_NATURES);
- propertyNames.add(PROJECT_DESCRIPTION);
- return propertyNames;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(PROJECT_LOCATION)) {
- if (getBooleanProperty(USE_DEFAULT_LOCATION)) {
- return null;
- } else if (isPropertySet(USER_DEFINED_BASE_LOCATION)) {
- return getStringProperty(USER_DEFINED_BASE_LOCATION) + File.separator + getStringProperty(PROJECT_NAME);
- }
- return getProperty(USER_DEFINED_LOCATION);
- } else if (DEFAULT_LOCATION.equals(propertyName)) {
- return getDefaultLocation();
- } else if (USE_DEFAULT_LOCATION.equals(propertyName)) {
- return Boolean.TRUE;
- } else if (USER_DEFINED_LOCATION.equals(propertyName) || USER_DEFINED_BASE_LOCATION.equals(propertyName)) {
- return ""; //$NON-NLS-1$
- } else if (propertyName.equals(PROJECT_DESCRIPTION))
- return getProjectDescription();
- return super.getDefaultProperty(propertyName);
- }
-
- private String getDefaultLocation() {
- IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- String projectName = (String) getProperty(PROJECT_NAME);
- if (projectName != null)
- path = path.append(projectName);
- return path.toOSString();
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyName.equals(PROJECT_LOCATION) || propertyName.equals(DEFAULT_LOCATION) || propertyName.equals(PROJECT_DESCRIPTION)) {
- throw new RuntimeException();
- } else if (propertyName.equals(PROJECT_NAME)) {
- IStatus stat = model.validateProperty(PROJECT_NAME);
- if (stat != OK_STATUS)
- return true;
- model.setProperty(PROJECT, getProject());
- model.notifyPropertyChange(DEFAULT_LOCATION, IDataModel.VALUE_CHG);
- if (getBooleanProperty(USE_DEFAULT_LOCATION) || isPropertySet(USER_DEFINED_BASE_LOCATION)) {
- model.notifyPropertyChange(PROJECT_LOCATION, IDataModel.VALUE_CHG);
- }
- } else if (propertyName.equals(USE_DEFAULT_LOCATION)) {
- model.notifyPropertyChange(PROJECT_LOCATION, IDataModel.VALUE_CHG);
- } else if ((propertyName.equals(USER_DEFINED_LOCATION) || propertyName.equals(USER_DEFINED_BASE_LOCATION)) && !getBooleanProperty(USE_DEFAULT_LOCATION)) {
- model.notifyPropertyChange(PROJECT_LOCATION, IDataModel.VALUE_CHG);
- }
- return true;
- }
-
- private IProjectDescription getProjectDescription() {
- String projectName = (String) getProperty(PROJECT_NAME);
- IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
- String projectLocation = (String) getProperty(PROJECT_LOCATION);
- if (projectLocation != null)
- desc.setLocation(new Path(projectLocation));
- else
- desc.setLocation(null);
- return desc;
- }
-
- protected IProject getProject() {
- String projectName = (String) getProperty(PROJECT_NAME);
- return (null != projectName && projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(PROJECT_NAME)) {
- String name = model.getStringProperty(PROJECT_NAME);
- IStatus status = validateName(name);
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION)) {
- IStatus status = validateLocation();
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION) || propertyName.equals(PROJECT_NAME)) {
- String projectName = getStringProperty(PROJECT_NAME);
-
- String projectLoc = ""; //$NON-NLS-1$
- if (getBooleanProperty(USE_DEFAULT_LOCATION)) {
- projectLoc = getDefaultLocation();
- } else {
- projectLoc = getStringProperty(PROJECT_LOCATION);
- }
- return validateExisting(projectName, projectLoc);
- }
- return OK_STATUS;
- }
-
- /**
- * @param projectName
- * @param projectLoc
- * @todo Generated comment
- */
- public static IStatus validateExisting(String projectName, String projectLoc) {
- if (projectName != null && !projectName.equals("")) {//$NON-NLS-1$
- File file = new File(projectLoc);
- if (file.exists()) {
- if (file.isDirectory()) {
- File dotProject = new File(file, ".project");//$NON-NLS-1$
- if (dotProject.exists()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_AT_LOCATION_ERROR, new Object[]{file.toString()}));
- }
- }
- }
- }
- return OK_STATUS;
- }
-
- public static IProject getProjectHandleFromProjectName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- return (null != projectName && projectName.length() > 0 && status.isOK()) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- public static IStatus validateProjectName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- if (!status.isOK())
- return status;
- if (projectName.endsWith(" ")) //$NON-NLS-1$
- return WTPCommonPlugin.createErrorStatus(WTPResourceHandler.getString("41")); //$NON-NLS-1$
- return OK_STATUS;
- }
-
- public static IStatus validateName(String name) {
- IStatus status = validateProjectName(name);
- if (!status.isOK())
- return status;
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (project.exists()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_SAMENAME_ERROR, new Object[]{name}));
- }
- if (!WTPPlugin.isPlatformCaseSensitive()) {
- // now look for a matching case variant in the tree
- IResource variant = ((Resource) project).findExistingResourceVariant(project.getFullPath());
- if (variant != null) {
- return WTPCommonPlugin.createErrorStatus(WTPResourceHandler.getString("42")); //$NON-NLS-1$
- }
- }
- return OK_STATUS;
- }
-
-
- private IStatus validateLocation() {
- String loc = (String) getProperty(PROJECT_LOCATION);
- if (null != loc) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(loc);
- return workspace.validateProjectLocation(getProject(), path);
- }
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java
deleted file mode 100644
index 69441cd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java
+++ /dev/null
@@ -1,84 +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 27, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated
- *
- * @see ProjectCreationDataModelProviderNew
- */
-public class ProjectCreationOperation extends AbstractDataModelOperation implements IProjectCreationProperties, DoNotUseMeThisWillBeDeletedPost15{
-
- public ProjectCreationOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- IProgressMonitor subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
- IProjectDescription desc = (IProjectDescription) model.getProperty(PROJECT_DESCRIPTION);
- IProject project = (IProject) model.getProperty(PROJECT);
- if (!project.exists()) {
- project.create(desc, subMonitor);
- }
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
-
- project.open(subMonitor);
-
- String[] natureIds = (String[]) model.getProperty(PROJECT_NATURES);
- if (null != natureIds) {
- desc = project.getDescription();
- desc.setNatureIds(natureIds);
- project.setDescription(desc, monitor);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } finally {
- monitor.done();
- }
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- return OK_STATUS;
- }
-
- public boolean canUndo() {
- return false;
- }
-
- public boolean canRedo() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperationNew.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperationNew.java
deleted file mode 100644
index d837cfe..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperationNew.java
+++ /dev/null
@@ -1,76 +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 27, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ProjectCreationOperationNew extends AbstractDataModelOperation implements IProjectCreationPropertiesNew {
-
- public ProjectCreationOperationNew(IDataModel dataModel) {
- super(dataModel);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- IProgressMonitor subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
- IProjectDescription desc = (IProjectDescription) model.getProperty(PROJECT_DESCRIPTION);
- IProject project = (IProject) model.getProperty(PROJECT);
- if (!project.exists()) {
- project.create(desc, subMonitor);
- }
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
-
- project.open(subMonitor);
-
- String[] natureIds = (String[]) model.getProperty(PROJECT_NATURES);
- if (null != natureIds) {
- desc = project.getDescription();
- desc.setNatureIds(natureIds);
- project.setDescription(desc, monitor);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } finally {
- monitor.done();
- }
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- return OK_STATUS;
- }
-
- public boolean canUndo() {
- return false;
- }
-
- public boolean canRedo() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.html b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.html
deleted file mode 100644
index 65a58f5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>wtp operation api overview</title>
-</head>
-<body>
-<p>The WTP Operation API allows clients to do...everything!</p>
-<table width="500">
-<tr>
-<td>
-<p>Under Construction.</p>
-</td>
-</tr>
-</table>
-<table cellpadding="10" cellspacing="10">
-<tr>
-<td>
-<p>
-<img src="escape_out_to_source_folder level/overview/your_image.jpg"></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>
-<i>Figure 1: Image description</i>
-</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.xml b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.xml
deleted file mode 100644
index 9d050d4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../" />
- <title>wtp operation api overview</title>
- </head>
-
- <body>
- <abstract>The WTP Operation API allows clients to do...everything!</abstract>
-
- <!-- formatting handled by XSLT Transformation -->
- <p>Under Construction.</p>
- <img src="escape_out_to_source_folder level/overview/your_image.jpg" caption ="Image description" />
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonMessages.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonMessages.java
deleted file mode 100644
index 8fade80..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonMessages.java
+++ /dev/null
@@ -1,53 +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 Nov 5, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.plugin;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WTPCommonMessages {
- public static final String PROJECT_EXISTS_ERROR = "1"; //$NON-NLS-1$
- public static final String PROJECT_NOT_EAR = "2"; //$NON-NLS-1$
- public static final String INCOMPATABLE_J2EE_VERSIONS = "3"; //$NON-NLS-1$
- public static final String SAME_MODULE_AND_EAR_NAME = "4"; //$NON-NLS-1$
- public static final String ARCHIVE_FILE_NAME_EMPTY_ERROR = "5"; //$NON-NLS-1$
- public static final String FILE_DOES_NOT_EXIST_ERROR = "6"; //$NON-NLS-1$
- public static final String INTERNAL_ERROR = "7"; //$NON-NLS-1$
- public static final String PROJECT_NAME_INVALID = "8"; //$NON-NLS-1$
- public static final String DESTINATION_ARCHIVE_SHOULD_END_WITH = "9"; //$NON-NLS-1$
- public static final String DESTINATION_INVALID = "10"; //$NON-NLS-1$
- public static final String IS_READ_ONLY = "11"; //$NON-NLS-1$
- public static final String RESOURCE_EXISTS_ERROR = "12"; //$NON-NLS-1$
- public static final String PROJECT_NOT_EXISTS_ERROR = "13"; //$NON-NLS-1$
- public static final String SPEC_LEVEL_NOT_FOUND = "14"; //$NON-NLS-1$
- public static final String PROJECT_NAME_EMPTY = "15"; //$NON-NLS-1$
- public static final String PROJECT_ClOSED = "31"; //$NON-NLS-1$
- public static final String PROJECT_EXISTS_AT_LOCATION_ERROR = "32"; //$NON-NLS-1$
- public static final String ERR_EMPTY_MODULE_NAME = "34"; //$NON-NLS-1$
- public static final String ERR_INVALID_CHARS = "35"; //$NON-NLS-1$
- public static final String DUPLICATE_COMPONENT_NAME="36";//$NON-NLS-1$
- public static final String MODULE_NOT_SUPPORTED="37";//$NON-NLS-1$
-
- public static final String MODULE_EXISTS_ERROR = "38"; //$NON-NLS-1$
- public static final String SOURCEFOLDER_EMPTY = "39"; //$NON-NLS-1$
- public static final String WEBCONTENTFOLDER_EMPTY = "40"; //$NON-NLS-1$
- public static final String PROJECT_EXISTS_SAMENAME_ERROR = "43"; //$NON-NLS-1$
- public static final String RUNTIME_NONE = "44"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonPlugin.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonPlugin.java
deleted file mode 100644
index 994c720..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/plugin/WTPCommonPlugin.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
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPCommonPlugin extends WTPPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks"; //$NON-NLS-1$
- public static final String GROUP_REGISTRY_EXTENSION_POINT = "functionGroup"; //$NON-NLS-1$
- public static final IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, "OK", null); //$NON-NLS-1$
-
- // The shared instance.
- private static WTPCommonPlugin plugin;
-
- public WTPCommonPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("wtp_common"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- public static WTPCommonPlugin getDefault() {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message) {
- return createErrorStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createWarningStatus(String message) {
- return createWarningStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createCancelStatus(String message) {
- return createCancelStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createWarningStatus(String message, Throwable exception) {
- return new Status(IStatus.WARNING, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message, Throwable exception) {
- return new Status(IStatus.ERROR, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createCancelStatus(String message, Throwable exception) {
- return new Status(IStatus.CANCEL, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = WTPCommonPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- public static String getResourceString(String key, Object[] args) {
- String pattern = getResourceString(key);
- if (pattern != null)
- return MessageFormat.format(pattern, args);
- return null;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
deleted file mode 100644
index e01feb3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
+++ /dev/null
@@ -1,54 +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
-###############################################################################
-1=A project already exists with this name and location.
-2=The specified EAR project "{0}" is not an EAR project.
-3=The EAR project "{0}" has a J2EEVersion of {1} which is not compatable with the specified module version.
-4=The EAR project name, "{0}", can not be the same as the project name.
-5={0} file name must be entered.
-6=The {0} does not exist.
-7=An internal error occurred. View log files for details.
-8=Project name is invalid.
-9=Destination archive should end with {0}.
-10=Destination archive is invalid.
-11=Destination location is read only.
-12=Resource {0} already exists. If you wish to overwrite select the "Overwrite Existing file" option.
-13=Project {0} does not exist.
-14=The selected version is not supported by the server.
-15=Enter a project name.
-16=Save problems
-17=Save could not be completed. Some related files may have already been saved.\n\nReason
-18={0} has been locked. Please ensure the operation is not currently executing.
-19=The extendedRoot is null. Make sure that isExtended() returns true.
-20=Property not located:
-21=Nested model not located:
-22=Cannot modify id once it has been set.
-23=The id cannot be null.
-24=ERROR:
-25=Extended Operation failure: {0}
-26=The Job completed successfully
-27=Exception occurred running job.
-28=Group cannot be resolved:
-29=Class not found for attribute {0} : {1}, Declaring plugin extension: {2}
-30=Function group {0} contains no pattern bindings
-31=Project {0} is closed.
-32=A project already exists on the file system at this location: {0}. Either use "Import Existing Projects into Workspace" to create a project at this location or delete the contents of {0} from the file system.
-33=A model instance may only be nested once under another model instance.
-34=Module name cannot be empty.
-35=Invalid characters.
-36=The module with this name already exists.
-37=The module is not supported by this server.
-38=Module name is invalid.
-39=Enter Source Folder
-40=Enter Web content Folder
-41=Project names cannot end with white space.
-42=Resource already exists with a different case.
-43=A project already exists with this name.
-44=<None>
diff --git a/plugins/org.eclipse.wst.common.infopop/.cvsignore b/plugins/org.eclipse.wst.common.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/plugins/org.eclipse.wst.common.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/plugins/org.eclipse.wst.common.infopop/.project b/plugins/org.eclipse.wst.common.infopop/.project
deleted file mode 100644
index d8e0250..0000000
--- a/plugins/org.eclipse.wst.common.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 76d68cc..0000000
--- a/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 03:12:42 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f774e3c..0000000
--- a/plugins/org.eclipse.wst.common.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Mon Apr 17 03:12:36 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.wst.common.infopop/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 603bfb0..0000000
--- a/plugins/org.eclipse.wst.common.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.common.infopop; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.wst.common.infopop/SnippetsContexts.xml b/plugins/org.eclipse.wst.common.infopop/SnippetsContexts.xml
deleted file mode 100644
index b3b0c43..0000000
--- a/plugins/org.eclipse.wst.common.infopop/SnippetsContexts.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="libv1000">
-<description>Use this view to catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP markup, along with custom tags, that can be embedded in existing files.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-</context>
-
-<context id="libv1100">
-<description>Supply values in this dialog to define the Snippets view object to be inserted in the current file at the cursor position. Assign a value to the variables being inserted.
-</description>
-<topic label="Inserting and editing items in the active editor" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-</context>
-
-<context id="libv1200">
-<description>In the <b>Name</b> field, type the name of the object as you want it be displayed in the Snippets view. Optionally, add a description of the object in the <b>Description</b> field.
-
-Select the <b>Hide</b> check box to make this snippet object not visible in the view.
-
-To add a new variable, click the <b>New</b> push button, and type values in the cells of the <b>Variables</b> table. The <b>Name</b> field represents name of the variable that will be inserted when you add it to a document. <b>Default value</b> is the initial value of the named variable. Optionally, add a description of the variable.
-
-Insert the variables that you define into the <b>Template Pattern</b> field using the <b>Insert Variable Placeholder</b> push button.
-</description>
-<topic label="Deleting or hiding snippet items or drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html"/>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-</context>
-
-<context id="libv1300">
-<description>Type the name of the new category in the <b>Name</b> field and optionally add a description of the category in the <b>Description</b> field.
-
-Select <b>Open drawer at start-up</b> to have the category drawer opened in the Snippets view when the workbench starts up.
-
-You can specify how you want the category drawer displayed in the Snippets view by selecting a radio button for the <b>Show/Hide Drawer</b> field.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Deleting or hiding snippet items or drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html"/>
-</context>
-
-<context id="snip0010">
-<description>Select this option to open the <b>Import</b> dialog, which lets you import snippet categories from the file system.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Adding items to snippets drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-</context>
-
-<context id="snip0020">
-<description>Select this option to open the <b>Export</b> dialog, which lets you export snippet categories to the file system.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Adding items to snippets drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-</context>
-
-<context id="snip0030">
-<description>Select the content types that should be visible in this drawer for in the Snippets view.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Deleting or hiding snippet items or drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html"/>
-</context>
-
-<context id="snip0040">
-<description>This menu item adds the selected text to the Snippets view as a new item.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Adding items to snippets drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-</context>
-
-<context id="snip0050">
-<description>This menu item cuts the selected Snippet item to the clipboard.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Editing snippet items" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html"/>
-</context>
-
-<context id="snip0060">
-<description>This menu item copies the selected Snippet item to the clipboard.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Editing snippet items" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html"/>
-</context>
-
-<context id="snip0070">
-<description>This menu item creates a new Snippets view item containing the current contents of the clipboard.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Adding items to snippets drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-</context>
-<context id="snip0080">
-<description>Type a name for the category. The category appears in the Customize Palette dialog box. Once you have created a category, you can add items to the category.
-</description>
-<topic label="Snippets view" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt001.html"/>
-<topic label="Adding items to snippets drawers" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html"/>
-</context>
-
-</contexts>
diff --git a/plugins/org.eclipse.wst.common.infopop/about.html b/plugins/org.eclipse.wst.common.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.infopop/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.infopop/build.properties b/plugins/org.eclipse.wst.common.infopop/build.properties
deleted file mode 100644
index c1d3dbf..0000000
--- a/plugins/org.eclipse.wst.common.infopop/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
- about.html,\
- SnippetsContexts.xml,\
- META-INF/,\
- plugin.properties
diff --git a/plugins/org.eclipse.wst.common.infopop/plugin.properties b/plugins/org.eclipse.wst.common.infopop/plugin.properties
deleted file mode 100644
index 74f0260..0000000
--- a/plugins/org.eclipse.wst.common.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.common.infopop
-Bundle-Name.0 = Common WST infopops
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.infopop/plugin.xml b/plugins/org.eclipse.wst.common.infopop/plugin.xml
deleted file mode 100644
index f1e178c..0000000
--- a/plugins/org.eclipse.wst.common.infopop/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
- <contexts file="SnippetsContexts.xml" plugin ="org.eclipse.wst.common.snippets"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/.classpath b/plugins/org.eclipse.wst.common.ui/.classpath
deleted file mode 100644
index c483836..0000000
--- a/plugins/org.eclipse.wst.common.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-search"/>
- <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"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.ui/.cvsignore b/plugins/org.eclipse.wst.common.ui/.cvsignore
deleted file mode 100644
index 7cf79b0..0000000
--- a/plugins/org.eclipse.wst.common.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-ui.jar
-build.xml
-temp.folder
-org.eclipse.wst.common.ui_1.0.0.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.ui/.project b/plugins/org.eclipse.wst.common.ui/.project
deleted file mode 100644
index 8f557ef..0000000
--- a/plugins/org.eclipse.wst.common.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6830385..0000000
--- a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-#Mon Jan 30 23:41:58 EST 2006
-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=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-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=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=warning
-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.3
diff --git a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 48a6a5c..0000000
--- a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jan 30 23:11:49 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a16f02..0000000
--- a/plugins/org.eclipse.wst.common.ui/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.ui; singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Bundle-Activator: org.eclipse.wst.common.ui.internal.UIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.ui.internal;x-internal:=true,
- org.eclipse.wst.common.ui.internal.dialogs;x-internal:=true,
- org.eclipse.wst.common.ui.internal.dnd;x-internal:=true,
- org.eclipse.wst.common.ui.internal.search;x-internal:=true,
- org.eclipse.wst.common.ui.internal.search.dialogs,
- org.eclipse.wst.common.ui.internal.viewers;x-internal:=true,
- org.eclipse.wst.common.ui.provisional.editors
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.ui/README.txt b/plugins/org.eclipse.wst.common.ui/README.txt
deleted file mode 100644
index 4fc93df..0000000
--- a/plugins/org.eclipse.wst.common.ui/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-UI Utility classes for actions, drag'n'drop and wizards.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/about.html b/plugins/org.eclipse.wst.common.ui/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.ui/build.properties b/plugins/org.eclipse.wst.common.ui/build.properties
deleted file mode 100644
index b56a866..0000000
--- a/plugins/org.eclipse.wst.common.ui/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.properties,\
- plugin.xml,\
- .,\
- META-INF/,\
- about.html,\
- icons/
-jars.compile.order = .
-source.. = src/,\
- src-search/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.wst.common.ui/component.xml b/plugins/org.eclipse.wst.common.ui/component.xml
deleted file mode 100644
index d3d9ccc..0000000
--- a/plugins/org.eclipse.wst.common.ui/component.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
- name="org.eclipse.wst.common">
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.wst.common.ui" fragment="false" />
- <plugin id="org.eclipse.wst.common.ui.properties" fragment="false" />
- <plugin id="org.eclipse.wst.common.uriresolver" fragment="false" />
-
-<!-- <description url="http://eclipse.org/webtools/wst/components/common/overview.html" /> -->
-
-<!-- <package name="org.eclipse.wst.common.ui.viewers"> -->
-<!-- <type name="SelectSingleFileView" /> --> <!-- ?, does eclipse provide better support? -->
-<!-- <type name="ResourceFilter" /> -->
-<!-- <type name="SelectMultiFilePage" /> -->
-<!-- <type name="SelectSingleFilePage" /> -->
-<!-- <type name="TableNavigator" /> --> <!-- No, should be in eclipse base -->
-<!-- <type name="NavigableTableViewer" /> --> <!-- No, should be in eclipse base -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.actionhandler.action"> -->
-<!-- <type name="CutAction" /> --> <!-- No to these four, should be removed? -->
-<!-- <type name="PasteAction" /> -->
-<!-- <type name="CopyAction" /> -->
-<!-- <type name="EditAction" /> -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui"> -->
-<!-- <type name="UIPlugin" /> --> <!-- No, delete this -->
-<!-- <type name="OverlayIconManager" /> --> <!-- No -->
-<!-- <type name="WindowUtility" /> --> <!-- Remove class, clean up xsd.ui -->
-<!-- <type name="ImageFactory" /> --> <!-- No -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.wizards"> -->
-<!-- <type name="ExampleProjectCreationOperation" /> --> <!-- referenced externally only within package (ExampleProjectCreationWizardPage -->
-<!-- <type name="ExampleProjectCreationWizardPage" /> --> <!-- referenced externally only within package (ExampleProjectCreationWizard, and Operation -->
-<!-- <type name="ExampleProjectCreationWizard" /> --> <!-- referenced by XMLExampleProjectCreationWizard, which is deprecated and going to be removed in M4 -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.dnd"> -->
-<!-- <type name="ViewerDropAdapter" /> -->
-<!-- <type name="DragAndDropCommand" /> --> <!-- referenced externally only within package -->
-<!-- <type name="DragAndDropManager" /> --> <!-- -->
-<!-- <type name="ObjectTransfer" /> -->
-<!-- <type name="DefaultDragAndDropCommand" /> -->
-<!-- <type name="ViewerDragAdapter" /> -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.resource"> -->
-<!-- <type name="ResourceDeleteListener" /> --> <!-- no references -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.dialogs"> -->
-<!-- <type name="SelectSingleFileDialog" /> --> <!-- No, should look into base for support? -->
-<!-- </package> -->
-<!-- <package name="org.eclipse.wst.common.ui.actionhandler">
- <type name="ActionHandlerListener" />
- </package>
--->
-<!-- provisional APIs -->
-<!--
- <package name="org.eclipse.wst.common.uriresolver">
- <type name="URIResolverPlugin" subclass="false" instantiate="false"/>
- <type name="URIResolver" implement="false"/>
- <type name="URIResolverExtension" implement="true"/>
- </package>
--->
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/icons/collapseAll.gif b/plugins/org.eclipse.wst.common.ui/icons/collapseAll.gif
deleted file mode 100644
index 6fdffe5..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/collapseAll.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/icons/expandAll.gif b/plugins/org.eclipse.wst.common.ui/icons/expandAll.gif
deleted file mode 100644
index 1a99431..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/expandAll.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png b/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png
deleted file mode 100644
index 4923d03..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif b/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif
deleted file mode 100644
index 24a21eb..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/plugin.properties b/plugins/org.eclipse.wst.common.ui/plugin.properties
deleted file mode 100644
index 4b9b6af..0000000
--- a/plugins/org.eclipse.wst.common.ui/plugin.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-! Plugin properties
-pluginName = Eclipse Base UI extensions
-pluginProvider = Eclipse.org
-
-! SelectSingleFilePage and SelectMultiFilePage
-_UI_LABEL_SOURCE_FILES = Workbench Files
-_UI_LABEL_SELECTED_FILES = Selected Files
-_UI_POPUP_EXPAND_ALL = Expand All
-_UI_POPUP_COLLAPSE_ALL = Collapse All
-
-_UI_IMPORT_BUTTON = Import Files...
-_UI_IMPORT_BUTTON_TOOL_TIP = Import files from file system
-
-
-! SelectMultiFilePage
-! NOTE TO TRANSLATOR: the following three lines refers to _UI_LABEL_SELECTED_FILES label above
-_UI_ADD_BUTTON_TOOL_TIP = Add files to Selected Files list.
-_UI_REMOVE_BUTTON_TOOL_TIP = Remove files from Selected Files list.
-_UI_REMOVE_ALL_BUTTON_TOOL_TIP = Remove all files from Selected Files list.
-
-! NOTE TO TRANSLATOR: No translation needed of following three lines
-_UI_ADD_BUTTON = >
-_UI_REMOVE_BUTTON = <
-_UI_REMOVE_ALL_BUTTON = <<
-
-! SelectJavaProjectView
-_UI_LABEL_CHOOSE_FOLDER = Select a project or folder:
-
-! SelectJavaProjectDialog
-_UI_LABEL_FOLDER_SELECTION = Container Selection
-
-! TextViewerOperationAction
-_UI_MENU_COPY = &Copy
-_UI_MENU_CUT = Cu&t
-_UI_MENU_DELETE = Delete
-_UI_MENU_PASTE = &Paste
-_UI_MENU_PREFIX = Prefix
-_UI_MENU_REDO = Redo
-_UI_MENU_SELECT_ALL = Select All
-_UI_MENU_SHIFT_LEFT = Shift Left
-_UI_MENU_SHIFT_RIGHT = Shift Right
-_UI_MENU_STRIP_PREFIX = Strip Prefix
-_UI_MENU_UNDO = Undo
-
-! SourceViewerGotoLineAction
-_UI_MENU_GOTO_LINE = Go To Line...
-_UI_GOTO_LINE_DIALOG_TITLE = Go To Line
-_UI_GOTO_LINE_DIALOG_TEXT = Enter Line Number
-
-_UI_FILE_CHANGED_TITLE = File Changed
-_UI_FILE_DELETED_SAVE_CHANGES = The file has been deleted from the file system. Do you want to save your changes or close the editor without saving?
-_UI_FILE_DELETED_EDITOR_CLOSED = The file has been deleted from the file system. This editor will be closed.
-_UI_FILE_CHANGED_LOAD_CHANGES = The file has been changed on the file system. Do you want to load the changes?
-_UI_SAVE_BUTTON = Save
-_UI_CLOSE_BUTTON = Close
-
-
-! XSL Prefererence
-_UI_XSLT_SELECT = Select which element to use for your stylesheet
-_UI_XSLT_STYLESHEET = &Use <xsl:stylesheet>
-_UI_XSLT_TRANSFORM = U&se <xsl:transform>
-
-! XSL Debug Prefererence
-_UI_XSL_DEBUG_SELECT_LAUNCHER = Set the default XSL launcher for the XSL Debugging and Transformation tool
-_UI_XSL_DEBUG_LOCAL = &XSL application
-_UI_XSL_DEBUG_REMOTE = XS&L remote application
-_UI_XSL_TILE_EDITOR = &Show all debugging files in a tile editor
-_UI_XSL_DEBUG_AND_TRANSFORM = &Run transformation and open a debugging session
-_UI_XSL_CONTEXT_URI = Context Path
-_UI_XSL_CONTEXT = Specify a &context path for resolving URIs in xsl:import, xsl:include or document()
-
-
-_UI_OVERRIDE_FILE = Overwrite existing files
-_UI_JAVA_EXIST_FILE1 = The following Java classes already exist.
-_UI_JAVA_EXIST_FILE2 = Do you want to overwrite the existing file?
-
-! some options strings common to several plugins
-_UI_ERROR_CREATING_FILE_TITLE = Error Creating File
-_UI_ERROR_CREATING_FILE_SHORT_DESC = Error creating file "{0}"
-_UI_ERROR_CREATING_FILE_LONG_DESC = An error occured while attempting to create the file "{0}".
-_UI_PARENT_FOLDER_IS_READ_ONLY = The parent directory "{0}" is read only.
-_UI_UNKNOWN_ERROR_WITH_HINT = Unknown error. Ensure that the parent directory "{0}" is writeable.
-_UI_UNKNOWN_ERROR = Unknown error. Ensure that the parent directory "{0}" is writeable.
-
-! usage - this label is followed by two radio button options for the file location
-_UI_LABEL_INCLUDE_URL_FILE = Select file location
-_UI_RADIO_FILE = Workbench projects
-_UI_RADIO_URL = HTTP
-
-_UI_LABEL_COMPONENTS = Components:
-_UI_LABEL_QUALIFIER = Qualifier:
-
-!- component selection dialogs
-_UI_LABEL_COMPONENT_NAME = Component Name:
-_UI_LABEL_MATCHING_COMPONENTS = Matching Components:
-_UI_LABEL_SPECIFIED_FILE = Specified File
-_UI_LABEL_ENCLOSING_PROJECT = Enclosing Project
-_UI_LABEL_WORKSPACE = Workspace
-_UI_LABEL_CURRENT_RESOURCE = Current Resource
-_UI_LABEL_SEARCH_SCOPE = Search Scope
-_UI_LABEL_NARROW_SEARCH_SCOPE_RESOURCE = Use resource view to narrow search scope
-_UI_LABEL_AVAILABLE_TYPES = Available Types
-_UI_LABEL_WORKING_SETS = Working Sets
-
-_UI_LABEL_New=New...
-_UI_LABEL_DECLARATION_LOCATION=Declaration Location:
-_UI_LABEL_CHOOSE=Choose...
-
-!======================================================================================
-!
-! Here is the list of Error string that have message IDs - make sure they are unique
-! Range for b2bgui messageIDs: IWAX1201 - IWAX1400
-!
-!======================================================================================
-
-_ERROR_THE_CONTAINER_NAME = The specified container must exist in the workspace and its path must start at the workspace root.
-
-_ERROR_LOCAL_LOCATION = The local location of this container cannot be resolved.
-_ERROR_NOT_JAVA_PROJECT = The specified project is not a Java project.
-
-!NOTE TO TRANSLATOR: this error message text is followed by a message from another plugin
-_ERROR_INVALID_JAVA_PACKAGE = IWAX1201E Invalid package name error:
-
-!NOTE TO TRANSLATOR: (_ERROR_BAD_FILENAME_EXTENSION + string + _UI_LABEL_OR + string) or (_ERROR_BAD_FILENAME_EXTENSION)
-_ERROR_BAD_FILENAME_EXTENSION = The file name must end with
-_ERROR_FILE_ALREADY_EXISTS = The same name already exists.
-
-_ERROR_CONTAINER_NOT_JAVA_BUILDPATH = The container is not a Java source folder for this project
-_ERROR_USE_PROJECT_JAVA_SOURCE_FOLDER = The project is not on the build path. Select a Java source folder for the project.
-
-_UI_ERROR = Error
-
-!NOTE TO TRANSLATOR: this warning message text is followed by a message from another plugin
-_WARN_INVALID_JAVA_PACKAGE = Invalid package name warning:
-
-_ERROR_ROOT_ELEMENT = The XML schema does not contain any global elements that can be used as a root element.
-_ERROR_SAVING_FILE = Error saving file "{0}"
-
-! File Validator
-_UI_ERROR_VALIDATE_FAIL_TITLE = Failed to check out necessary files
-_UI_ERROR_VALIDATE_FAIL_MESSAGE = Generation failed. Necessary files could not be checked out.
-
-! PropertyDirtyChangeListener and PropertyResourceChangeListener
-_UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE = Error
-
-ExampleProjectCreationWizard.title=New Example Project
-ExampleProjectCreationWizard.op_error.title=Project Creation Failed
-ExampleProjectCreationWizard.op_error.message=Project could not be created.
-
-ExampleProjectCreationWizard.overwritequery.title=Overwrite
-ExampleProjectCreationWizard.overwritequery.message=Do you want to overwrite {0}?
-
-
-ExampleProjectCreationOperation.op_desc=Creating example projects...
-ExampleProjectCreationOperation.op_desc_proj=Configuring project...
-
-ExampleProjectCreationWizardPage.error.alreadyexists=Project already exists.
-SaveFilesDialog_save_all_resources=Save All Modified Resources
-SaveFilesDialog_must_save=All modified resources must be saved before this operation.
diff --git a/plugins/org.eclipse.wst.common.ui/plugin.xml b/plugins/org.eclipse.wst.common.ui/plugin.xml
deleted file mode 100644
index f00b632..0000000
--- a/plugins/org.eclipse.wst.common.ui/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="exampleProjectCreationWizard" name="Example Project Creation Wizard" schema="schema/exampleProjectCreationWizard.exsd"/>
- <extension
- point="org.eclipse.search.searchResultViewPages">
- <viewPage
- id="org.eclipse.wst.common.ui.internal.search.SearchResultPage"
- searchResultClass="org.eclipse.wst.common.ui.internal.search.SearchResult"
- class="org.eclipse.wst.common.ui.internal.search.SearchResultPage">
- </viewPage>
- </extension>
-
- <!--
- <extension point="org.eclipse.ui.popupMenus">
- <objectContribution
- id="test"
- objectClass="org.eclipse.core.resources.IFile">
- <action
- id="testit"
- enablesFor="1"
- style="pulldown"
- menubarPath="additions"
- label="TEST SEARCH DIALOG"
- class="org.eclipse.wst.common.ui.internal.search.dialogs.Test">
- </action>
- </objectContribution>
- </extension>
- -->
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
deleted file mode 100644
index 578c329..0000000
--- a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.ui" id="ExampleProjectCreationWizard" name="Example Project Creation Wizard"/>
- </appInfo>
- <documentation>
- This extension point allows to extend New project withard with the
-page set up setup information for the created project as well as source files that will be imported on the project creation.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="wizard"/>
- </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="wizard">
- <complexType>
- <sequence>
- <element ref="projectsetup" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- Id of the wizard that this extension is intended for.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="banner" type="string">
- <annotation>
- <documentation>
- Plugin relative path to the image that will be displayed as a banner on the wizard.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectsetup">
- <annotation>
- <documentation>
- Element that describes additional project setup.
-There will be as many pages created for the wizard as there are projectsetup elements.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="import" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="nature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="references" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="pagetitle" type="string">
- <annotation>
- <documentation>
- Title of the wizard's page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- Initial project name that will be provided on the wizard page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string">
- <annotation>
- <documentation>
- Label for the project name field on the wizard page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pagedescription" type="string">
- <annotation>
- <documentation>
- Description of the wizard page
- </documentation>
- </annotation>
- </attribute>
- <attribute name="open" type="string">
- <annotation>
- <documentation>
- Plugin relative path of the file that will be opened when wizard finished.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="import">
- <annotation>
- <documentation>
- Element that describes what to import into the project when it's created.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="dest" type="string">
- <annotation>
- <documentation>
- Project relative path of the folder where project files will be imported to, if not specified, it's the projest itself.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="src" type="string">
- <annotation>
- <documentation>
- Plugin relative path of the import .zip file with the files to be imported into the project.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="nature">
- <annotation>
- <documentation>
- Element that specified Eclipse nature that is applicable to the project.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- The id of the nature that will be opened when project will be created.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="references">
- <annotation>
- <documentation>
- Element that specifies reference for the project that will be created.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- The id of the referenced project.
- </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>
- <pre>
- <extension
- point="org.eclipse.wst.common.ui.exampleProjectCreationWizard"
- id="org.eclipse.wst.xml.ui.ExampleProjectCreationWizardExtension">
- <wizard
- id="org.eclipse.wst.xml.ui.ExampleProjectCreationWizard"
- banner="icons/newSampleProject_wizbanner.gif">
- <projectsetup
- pagetitle="%XMLExampleProjectCreationWizard.pagetitle"
- name="%XMLExampleProjectCreationWizard.projectname"
- label="%XMLExampleProjectCreationWizard.label"
- pagedescription="%XMLExampleProjectCreationWizard.pagedescription"
- open="readme.html">
- <import
- dest=""
- src="examples/EditingAndValidatingXML.zip">
- </import>
- </projectsetup>
- </wizard>
- </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.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java
deleted file mode 100644
index ade97fe..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.search.ui.IQueryListener;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.basecode.Messages;
-
-
-public abstract class AbstractSearchQuery implements ISearchQuery {
-
- protected String fPattern;
- protected SearchScope fScope;
- protected SearchResult fResult;
- protected String fScopeDescription;
-
- public AbstractSearchQuery(String pattern, SearchScope scope, String scopeDescription) {
- super();
- fPattern= pattern;
- fScope= scope;
- fScopeDescription= scopeDescription;
- }
-
- public boolean canRerun() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean canRunInBackground() {
- return true;
- }
-
- public String getLabel() {
- return SearchMessages.FileSearchQuery_label;
- }
-
- public ISearchResult getSearchResult() {
- if (fResult == null) {
- fResult= new SearchResult(this);
- new SearchResultUpdater(fResult);
- }
- return fResult;
- }
-
- public String getResultLabel(int nMatches) {
- if (nMatches == 1) {
- if (fPattern.length() > 0) {
- Object[] args= { fPattern, fScopeDescription };
- return Messages.format(SearchMessages.FileSearchQuery_singularLabel, args);
- }
- Object[] args= { "", fScopeDescription };
- return Messages.format(SearchMessages.FileSearchQuery_singularLabel_fileNameSearch, args);
- }
- if (fPattern.length() > 0) {
- Object[] args= { fPattern, new Integer(nMatches), fScopeDescription }; //$NON-NLS-1$
- return Messages.format(SearchMessages.FileSearchQuery_pluralPattern, args);
- }
- Object[] args= { "", new Integer(nMatches), fScopeDescription }; //$NON-NLS-1$
- return Messages.format(SearchMessages.FileSearchQuery_pluralPattern_fileNameSearch, args);
-
-
- }
-
- public IStatus run(IProgressMonitor pm) throws OperationCanceledException {
- final SearchResult textResult= (SearchResult) getSearchResult();
- textResult.removeAll();
- SearchQueryResultCollector collector= new SearchQueryResultCollector(textResult);
- String searchString= fPattern;
- if (searchString.trim().equals(String.valueOf('*'))) {
- searchString= new String();
- }
- String message= SearchMessages.TextSearchEngine_statusMessage;
- MultiStatus status= new MultiStatus(NewSearchUI.PLUGIN_ID, IStatus.OK, message, null);
-
- SearchEngine searchEngine = new SearchEngine();
-
- QualifiedName typeName = QualifiedName.valueOf(searchString);
-
- try {
- SearchPattern pattern = createSearchPattern(typeName);
- searchEngine.search(pattern, collector, fScope, null, new NullProgressMonitor());
- } catch (CoreException e) {
- status.add(e.getStatus());
- }
-
- return status;
-
- }
-
- protected abstract SearchPattern createSearchPattern(QualifiedName typeName);
-
- public class SearchResultUpdater implements IResourceChangeListener, IQueryListener {
- SearchResult fResult;
-
- public SearchResultUpdater(SearchResult result) {
- fResult= result;
- NewSearchUI.addQueryListener(this);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta= event.getDelta();
- if (delta != null)
- handleDelta(delta);
- }
-
- protected void handleDelta(IResourceDelta d) {
- try {
- d.accept(new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta delta) throws CoreException {
- switch (delta.getKind()) {
- case IResourceDelta.ADDED :
- return false;
- case IResourceDelta.REMOVED :
- IResource res= delta.getResource();
- if (res instanceof IFile) {
- Match[] matches= fResult.getMatches(res);
- fResult.removeMatches(matches);
- }
- break;
- case IResourceDelta.CHANGED :
- // handle changed resource
- break;
- }
- return true;
- }
- });
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- public void queryAdded(ISearchQuery query) {
- // don't care
- }
-
- public void queryRemoved(ISearchQuery query) {
- if (fResult.equals(query.getSearchResult())) {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- NewSearchUI.removeQueryListener(this);
- }
- }
-
- public void queryStarting(ISearchQuery query) {
- // don't care
- }
-
- public void queryFinished(ISearchQuery query) {
- // don't care
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/ISearchConstants.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/ISearchConstants.java
deleted file mode 100644
index 0bc1403..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/ISearchConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-public interface ISearchConstants {
-
- /**
- * The search result is a declaration.
- * Can be used in conjunction with any of the nature of searched elements
- * so as to better narrow down the search.
- */
- public static int DECLARATIONS= 0;
-
-
- /**
- * The search result is a reference.
- * Can be used in conjunction with any of the nature of searched elements
- * so as to better narrow down the search.
- * References can contain implementers since they are more generic kind
- * of matches.
- */
- public static int REFERENCES= 1;
-
- /**
- * The search result is a declaration, or a reference.
- * Can be used in conjunction with any of the nature of searched elements
- * so as to better narrow down the search.
- */
- public static int ALL_OCCURRENCES= 2;
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java
deleted file mode 100644
index 9bfdfef..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class SearchMessages extends NLS {
-
- private static final String BUNDLE_NAME= "org.eclipse.wst.common.ui.internal.search.SearchMessages";//$NON-NLS-1$
-
- private SearchMessages() {
- // Do not instantiate
- }
-
- public static String group_references;
- public static String Search_FindDeclarationAction_label;
- public static String Search_FindDeclarationsInProjectAction_label;
- public static String Search_FindDeclarationsInWorkingSetAction_label;
- public static String FileSearchPage_limited_format;
- public static String FileSearchPage_error_marker;
- public static String FileSearchPage_sort_by_label;
- public static String OpenWithMenu_label;
- public static String FileSearchQuery_label;
- public static String FileSearchQuery_pluralPattern;
- public static String FileSearchQuery_singularLabel;
- public static String FileSearchQuery_singularLabel_fileNameSearch;
- public static String FileSearchQuery_pluralPattern_fileNameSearch;
- public static String TextSearchEngine_statusMessage;
- public static String FileLabelProvider_count_format;
- public static String FileLabelProvider_removed_resource_label;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, SearchMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
deleted file mode 100644
index d3e9f83..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-group_references= Re&ferences
-Search_FindDeclarationAction_label= &Workspace
-Search_FindDeclarationsInProjectAction_label= &Project
-Search_FindDeclarationsInWorkingSetAction_label= Working &Set...
-FileSearchPage_limited_format={0} (showing {1} of {2} files)
-FileSearchPage_error_marker=Could not create marker
-FileSearchPage_sort_by_label=Sort By
-OpenWithMenu_label= Open Wit&h
-
-FileLabelProvider_count_format={0} ({1} matches)
-FileLabelProvider_removed_resource_label=<removed resource>
-
-FileSearchQuery_label=File Search
-
-# The first argument will be replaced by the pattern, the second by the count and the third by the scope
-FileSearchQuery_pluralPattern= ''{0}'' - {1} matches in {2}
-
-# The first argument will be replaced by the pattern, the second by the scope
-FileSearchQuery_singularLabel= ''{0}'' - 1 match in {1}
-
-FileSearchQuery_singularLabel_fileNameSearch=1 file name matching ''{0}'' in {1}
-FileSearchQuery_pluralPattern_fileNameSearch={1} file names matching ''{0}'' in {2}
-
-TextSearchEngine_statusMessage= Problems encountered during text search.
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchQueryResultCollector.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchQueryResultCollector.java
deleted file mode 100644
index 91d234a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchQueryResultCollector.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.SearchRequestor;
-
-class SearchQueryResultCollector extends SearchRequestor {
-
- private SearchResult fSearchResult;
-
-
- protected SearchQueryResultCollector(SearchResult result){
- super();
- fSearchResult= result;
- }
-
- public void acceptSearchMatch(SearchMatch match) throws CoreException {
- Match aMatch = new Match(match.getFile(), match.getOffset(), match.getLength());
- fSearchResult.addMatch(aMatch);
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java
deleted file mode 100644
index c2941d4..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.IEditorMatchAdapter;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-
-public class SearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter {
- private final Match[] EMPTY_ARR= new Match[0];
-
- private AbstractSearchQuery fQuery;
-
- public SearchResult(AbstractSearchQuery job) {
- fQuery= job;
- }
- public ImageDescriptor getImageDescriptor() {
- return UIPlugin.getDefault().getImageDescriptor("icons/tsearch_dpdn_obj.gif");
- }
- public String getLabel() {
- return fQuery.getResultLabel(getMatchCount());
- }
- public String getTooltip() {
- return getLabel();
- }
-
- public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile file) {
- return getMatches(file);
- }
-
- public IFile getFile(Object element) {
- if (element instanceof IFile)
- return (IFile)element;
- return null;
- }
-
- public boolean isShownInEditor(Match match, IEditorPart editor) {
- IEditorInput ei= editor.getEditorInput();
- if (ei instanceof IFileEditorInput) {
- IFileEditorInput fi= (IFileEditorInput) ei;
- return match.getElement().equals(fi.getFile());
- }
- return false;
- }
-
- public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) {
- IEditorInput ei= editor.getEditorInput();
- if (ei instanceof IFileEditorInput) {
- IFileEditorInput fi= (IFileEditorInput) ei;
- return getMatches(fi.getFile());
- }
- return EMPTY_ARR;
- }
-
- public ISearchQuery getQuery() {
- return fQuery;
- }
-
- public IFileMatchAdapter getFileMatchAdapter() {
- return this;
- }
-
- public IEditorMatchAdapter getEditorMatchAdapter() {
- return this;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java
deleted file mode 100644
index 03247b5..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import java.text.Collator;
-import java.text.MessageFormat;
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.util.DelegatingDragAdapter;
-//import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.search.ui.IContextMenuConstants;
-import org.eclipse.search.ui.ISearchResultViewPart;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionGroup;
-import org.eclipse.ui.actions.OpenFileAction;
-import org.eclipse.ui.actions.OpenWithMenu;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.part.ResourceTransfer;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.common.ui.internal.search.basecode.FileLabelProvider;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
-import org.eclipse.wst.common.ui.internal.search.basecode.ResourceTransferDragAdapter;
-import org.eclipse.wst.common.ui.internal.search.basecode.SortAction;
-
-
-public class SearchResultPage extends AbstractTextSearchViewPage implements IAdaptable {
-
- public static class DecoratorIgnoringViewerSorter extends ViewerSorter {
- private final ILabelProvider fLabelProvider;
-
- public DecoratorIgnoringViewerSorter(ILabelProvider labelProvider) {
- super(null); // lazy initialization
- fLabelProvider= labelProvider;
- }
-
- public int compare(Viewer viewer, Object e1, Object e2) {
- String name1= fLabelProvider.getText(e1);
- String name2= fLabelProvider.getText(e2);
- if (name1 == null)
- name1 = "";//$NON-NLS-1$
- if (name2 == null)
- name2 = "";//$NON-NLS-1$
- return getCollator().compare(name1, name2);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerSorter#getCollator()
- */
- public final Collator getCollator() {
- if (collator == null) {
- collator= Collator.getInstance();
- }
- return collator;
- }
- }
-
- private static final String KEY_SORTING= "org.eclipse.search.resultpage.sorting"; //$NON-NLS-1$
-
- private ActionGroup fActionGroup;
- private IFileSearchContentProvider fContentProvider;
- private int fCurrentSortOrder;
- private SortAction fSortByNameAction;
- private SortAction fSortByPathAction;
-
- // never used
- //private EditorOpener fEditorOpener= new EditorOpener();
-
-
- private static final String[] SHOW_IN_TARGETS= new String[] { IPageLayout.ID_RES_NAV };
- private static final IShowInTargetList SHOW_IN_TARGET_LIST= new IShowInTargetList() {
- public String[] getShowInTargetIds() {
- return SHOW_IN_TARGETS;
- }
- };
-
- // private IPropertyChangeListener fPropertyChangeListener;
-
- public SearchResultPage() {
- // TODO
- //fSortByNameAction= new SortAction(SearchMessages.FileSearchPage_sort_name_label, this, FileLabelProvider.SHOW_LABEL_PATH);
- //fSortByPathAction= new SortAction(SearchMessages.FileSearchPage_sort_path_label, this, FileLabelProvider.SHOW_PATH_LABEL);
- // cs : I've comment this code out for now. We need to review the changes to the base class and react accordingly.
- // Even more importantly we need to discuss with the base guys to get API lined up for this (see bug 163177).
- /*
- fPropertyChangeListener= new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (SearchPreferencePage.LIMIT_TABLE.equals(event.getProperty()) || SearchPreferencePage.LIMIT_TABLE_TO.equals(event.getProperty()))
- if (getViewer() instanceof TableViewer) {
- getViewPart().updateLabel();
- getViewer().refresh();
- }
- }
- };
- SearchPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener);
- */
-}
-
- public StructuredViewer getViewer() {
- return super.getViewer();
- }
-
- private void addDragAdapters(StructuredViewer viewer) {
- Transfer[] transfers= new Transfer[] { ResourceTransfer.getInstance() };
- int ops= DND.DROP_COPY | DND.DROP_LINK;
-
- DelegatingDragAdapter adapter= new DelegatingDragAdapter();
- adapter.addDragSourceListener(new ResourceTransferDragAdapter(viewer));
-
- viewer.addDragSupport(ops, transfers, adapter);
- }
-
- protected void configureTableViewer(TableViewer viewer) {
- viewer.setUseHashlookup(true);
- FileLabelProvider innerLabelProvider= new FileLabelProvider(this, fCurrentSortOrder);
- viewer.setLabelProvider(new DecoratingLabelProvider(innerLabelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
- viewer.setContentProvider(new SearchResultTableContentProvider(this));
- viewer.setSorter(new DecoratorIgnoringViewerSorter(innerLabelProvider));
- fContentProvider= (IFileSearchContentProvider) viewer.getContentProvider();
- addDragAdapters(viewer);
- }
-
- protected void configureTreeViewer(TreeViewer viewer) {
- viewer.setUseHashlookup(true);
- FileLabelProvider innerLabelProvider= new FileLabelProvider(this, FileLabelProvider.SHOW_LABEL);
- viewer.setLabelProvider(new DecoratingLabelProvider(innerLabelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
- viewer.setContentProvider(new SearchResultTreeContentProvider(viewer));
- viewer.setSorter(new DecoratorIgnoringViewerSorter(innerLabelProvider));
- fContentProvider= (IFileSearchContentProvider) viewer.getContentProvider();
- addDragAdapters(viewer);
- }
-
- protected void showMatch(Match match, int offset, int length, boolean activate) throws PartInitException {
- IFile file= (IFile) match.getElement();
- IWorkbenchPage wbPage= UIPlugin.getActivePage();
- IEditorPart editor= IDE.openEditor(wbPage, (IFile) match.getElement(), activate);
- if (offset != 0 && length != 0) {
- if (editor instanceof ITextEditor) {
- ITextEditor textEditor= (ITextEditor) editor;
- textEditor.selectAndReveal(offset, length);
- } else if (editor != null) {
- showWithMarker(editor, file, offset, length);
- }
- }
- }
-
- private void showWithMarker(IEditorPart editor, IFile file, int offset, int length) throws PartInitException {
- IMarker marker= null;
- try {
- marker= file.createMarker(NewSearchUI.SEARCH_MARKER);
- HashMap attributes= new HashMap(4);
- attributes.put(IMarker.CHAR_START, new Integer(offset));
- attributes.put(IMarker.CHAR_END, new Integer(offset + length));
- marker.setAttributes(attributes);
- IDE.gotoMarker(editor, marker);
- } catch (CoreException e) {
- throw new PartInitException(SearchMessages.FileSearchPage_error_marker, e);
- } finally {
- if (marker != null)
- try {
- marker.delete();
- } catch (CoreException e) {
- // ignore
- }
- }
- }
-
- protected void fillContextMenu(IMenuManager mgr) {
- super.fillContextMenu(mgr);
- addSortActions(mgr);
- fActionGroup.setContext(new ActionContext(getSite().getSelectionProvider().getSelection()));
- fActionGroup.fillContextMenu(mgr);
-// FileSearchQuery query= (FileSearchQuery) getInput().getQuery();
-
- }
-
-
- private void addSortActions(IMenuManager mgr) {
- if (getLayout() != FLAG_LAYOUT_FLAT)
- return;
- MenuManager sortMenu= new MenuManager(SearchMessages.FileSearchPage_sort_by_label);
- sortMenu.add(fSortByNameAction);
- sortMenu.add(fSortByPathAction);
-
- fSortByNameAction.setChecked(fCurrentSortOrder == fSortByNameAction.getSortOrder());
- fSortByPathAction.setChecked(fCurrentSortOrder == fSortByPathAction.getSortOrder());
-
- mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenu);
- }
-
- public void setViewPart(ISearchResultViewPart part) {
- super.setViewPart(part);
- fActionGroup= new NewTextSearchActionGroup(part);
- }
-
- public void dispose() {
- fActionGroup.dispose();
- // SearchPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener);
- super.dispose();
- }
-
- protected void elementsChanged(Object[] objects) {
- if (fContentProvider != null)
- fContentProvider.elementsChanged(objects);
- }
-
- protected void clear() {
- if (fContentProvider != null)
- fContentProvider.clear();
- }
-
- public void setSortOrder(int sortOrder) {
- fCurrentSortOrder= sortOrder;
- DecoratingLabelProvider lpWrapper= (DecoratingLabelProvider) getViewer().getLabelProvider();
- ((FileLabelProvider) lpWrapper.getLabelProvider()).setOrder(sortOrder);
- getViewer().refresh();
- getSettings().put(KEY_SORTING, fCurrentSortOrder);
- }
-
- public void restoreState(IMemento memento) {
- super.restoreState(memento);
- try {
- fCurrentSortOrder= getSettings().getInt(KEY_SORTING);
- } catch (NumberFormatException e) {
- //fCurrentSortOrder= fSortByNameAction.getSortOrder();
- }
- if (memento != null) {
- Integer value= memento.getInteger(KEY_SORTING);
- if (value != null)
- fCurrentSortOrder= value.intValue();
- }
- }
- public void saveState(IMemento memento) {
- super.saveState(memento);
- memento.putInteger(KEY_SORTING, fCurrentSortOrder);
- }
-
- public Object getAdapter(Class adapter) {
- if (IShowInTargetList.class.equals(adapter)) {
- return SHOW_IN_TARGET_LIST;
- }
- return null;
- }
-
- public String getLabel() {
- String label= super.getLabel();
- StructuredViewer viewer= getViewer();
- if (viewer instanceof TableViewer) {
- TableViewer tv= (TableViewer) viewer;
-
- AbstractTextSearchResult result= getInput();
- if (result != null) {
- int itemCount= ((IStructuredContentProvider) tv.getContentProvider()).getElements(getInput()).length;
- int fileCount= getInput().getElements().length;
- if (itemCount < fileCount) {
- String format= SearchMessages.FileSearchPage_limited_format;
- return MessageFormat.format(format, new Object[]{label, new Integer(itemCount), new Integer(fileCount)});
- }
- }
- }
- return label;
- }
-
- class NewTextSearchActionGroup extends ActionGroup {
-
- private ISelectionProvider fSelectionProvider;
- private IWorkbenchPage fPage;
- private OpenFileAction fOpenAction;
- private PropertyDialogAction fOpenPropertiesDialog;
-
- public NewTextSearchActionGroup(IViewPart part) {
- Assert.isNotNull(part);
- IWorkbenchPartSite site= part.getSite();
- fSelectionProvider= site.getSelectionProvider();
- fPage= site.getPage();
- fOpenPropertiesDialog= new PropertyDialogAction(site, fSelectionProvider);
- fOpenAction= new OpenFileAction(fPage);
- ISelection selection= fSelectionProvider.getSelection();
-
- if (selection instanceof IStructuredSelection)
- fOpenPropertiesDialog.selectionChanged((IStructuredSelection)selection);
- else
- fOpenPropertiesDialog.selectionChanged(selection);
-
- }
-
- public void fillContextMenu(IMenuManager menu) {
- // view must exist if we create a context menu for it.
-
- ISelection selection= getContext().getSelection();
- if (selection instanceof IStructuredSelection) {
- addOpenWithMenu(menu, (IStructuredSelection) selection);
- if (fOpenPropertiesDialog != null && fOpenPropertiesDialog.isEnabled() && selection != null &&fOpenPropertiesDialog.isApplicableForSelection((IStructuredSelection) selection))
- menu.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, fOpenPropertiesDialog);
- }
-
- }
-
- private void addOpenWithMenu(IMenuManager menu, IStructuredSelection selection) {
- if (selection == null || selection.size() != 1)
- return;
-
- Object o= selection.getFirstElement();
-
- if (!(o instanceof IAdaptable))
- return;
-
- fOpenAction.selectionChanged(selection);
- menu.appendToGroup(IContextMenuConstants.GROUP_OPEN, fOpenAction);
-
- // Create menu
- IMenuManager submenu= new MenuManager(SearchMessages.OpenWithMenu_label);
- submenu.add(new OpenWithMenu(fPage, (IAdaptable)o));
-
- // Add the submenu.
- menu.appendToGroup(IContextMenuConstants.GROUP_OPEN, submenu);
- }
-
- /* (non-Javadoc)
- * Method declared in ActionGroup
- */
- public void fillActionBars(IActionBars actionBar) {
- super.fillActionBars(actionBar);
- setGlobalActionHandlers(actionBar);
- }
-
- private void setGlobalActionHandlers(IActionBars actionBars) {
- actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), fOpenPropertiesDialog);
- }
- }
-
-
-}
-
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java
deleted file mode 100644
index f757d29..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
-
-public class SearchResultTableContentProvider implements IStructuredContentProvider, IFileSearchContentProvider {
-
- private final Object[] EMPTY_ARR= new Object[0];
-
- private SearchResultPage fPage;
- private AbstractTextSearchResult fResult;
-
- public SearchResultTableContentProvider(SearchResultPage page) {
- fPage= page;
- }
-
- public void dispose() {
- // nothing to do
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof SearchResult) {
- Object[] elements= ((SearchResult)inputElement).getElements();
- // cs : I've comment this code out for now. We need to review the changes to the base class and react accordingly.
- // Even more importantly we need to discuss with the base guys to get API lined up for this (see bug 163177).
- /*
- int tableLimit= SearchPreferencePage.getTableLimit();
- if (SearchPreferencePage.isTableLimited() && elements.length > tableLimit) {
- Object[] shownElements= new Object[tableLimit];
- System.arraycopy(elements, 0, shownElements, 0, tableLimit);
- return shownElements;
- }*/
- return elements;
- }
- return EMPTY_ARR;
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput instanceof SearchResult) {
- fResult= (SearchResult) newInput;
- }
- }
-
- public void elementsChanged(Object[] updatedElements) {
- TableViewer viewer= getViewer();
- // cs : I've comment 'tableLimited' related code out for now. We need to review the changes to the base class and react accordingly.
- // Even more importantly we need to discuss with the base guys to get API lined up for this (see bug 163177).
- //boolean tableLimited= SearchPreferencePage.isTableLimited();
- for (int i= 0; i < updatedElements.length; i++) {
- if (fResult.getMatchCount(updatedElements[i]) > 0) {
- if (viewer.testFindItem(updatedElements[i]) != null)
- viewer.update(updatedElements[i], null);
- else {
- //if (!tableLimited || viewer.getTable().getItemCount() < SearchPreferencePage.getTableLimit())
- viewer.add(updatedElements[i]);
- }
- } else
- viewer.remove(updatedElements[i]);
- }
- }
-
- private TableViewer getViewer() {
- return (TableViewer) fPage.getViewer();
- }
-
- public void clear() {
- getViewer().refresh();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java
deleted file mode 100644
index 7c79ce9..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search;
-
-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.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
-
-
-public class SearchResultTreeContentProvider implements ITreeContentProvider, IFileSearchContentProvider {
-
- private final Object[] EMPTY_ARR= new Object[0];
-
- private AbstractTextSearchResult fResult;
- private AbstractTreeViewer fTreeViewer;
- private Map fChildrenMap;
-
- SearchResultTreeContentProvider(AbstractTreeViewer viewer) {
- fTreeViewer= viewer;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- public void dispose() {
- // nothing to do
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput instanceof SearchResult) {
- initialize((SearchResult) newInput);
- }
- }
-
-
- protected synchronized void initialize(AbstractTextSearchResult result) {
- fResult= result;
- fChildrenMap= new HashMap();
- if (result != null) {
- Object[] elements= result.getElements();
- for (int i= 0; i < elements.length; i++) {
- insert(elements[i], false);
- }
- }
- }
-
- protected void insert(Object child, boolean refreshViewer) {
- Object parent= getParent(child);
- while (parent != null) {
- if (insertChild(parent, child)) {
- if (refreshViewer)
- fTreeViewer.add(parent, child);
- } else {
- if (refreshViewer)
- fTreeViewer.refresh(parent);
- return;
- }
- child= parent;
- parent= getParent(child);
- }
- if (insertChild(fResult, child)) {
- if (refreshViewer)
- fTreeViewer.add(fResult, child);
- }
- }
-
- /**
- * returns true if the child already was a child of parent.
- *
- * @param parent
- * @param child
- * @return Returns <code>trye</code> if the child was added
- */
- private boolean insertChild(Object parent, Object child) {
- Set children= (Set) fChildrenMap.get(parent);
- if (children == null) {
- children= new HashSet();
- fChildrenMap.put(parent, children);
- }
- return children.add(child);
- }
-
- protected void remove(Object element, boolean refreshViewer) {
- // precondition here: fResult.getMatchCount(child) <= 0
-
- if (hasChildren(element)) {
- if (refreshViewer)
- fTreeViewer.refresh(element);
- } else {
- if (fResult.getMatchCount(element) == 0) {
- fChildrenMap.remove(element);
- Object parent= getParent(element);
- if (parent != null) {
- removeFromSiblings(element, parent);
- remove(parent, refreshViewer);
- } else {
- removeFromSiblings(element, fResult);
- if (refreshViewer)
- fTreeViewer.refresh();
- }
- } else {
- if (refreshViewer) {
- fTreeViewer.refresh(element);
- }
- }
- }
- }
-
- private void removeFromSiblings(Object element, Object parent) {
- Set siblings= (Set) fChildrenMap.get(parent);
- if (siblings != null) {
- siblings.remove(element);
- }
- }
-
- public Object[] getChildren(Object parentElement) {
- Set children= (Set) fChildrenMap.get(parentElement);
- if (children == null)
- return EMPTY_ARR;
- return children.toArray();
- }
-
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
-
- public synchronized void elementsChanged(Object[] updatedElements) {
- for (int i= 0; i < updatedElements.length; i++) {
- if (fResult.getMatchCount(updatedElements[i]) > 0)
- insert(updatedElements[i], true);
- else
- remove(updatedElements[i], true);
- }
- }
-
- public void clear() {
- initialize(fResult);
- fTreeViewer.refresh();
- }
-
- public Object getParent(Object element) {
- if (element instanceof IProject)
- return null;
- if (element instanceof IResource) {
- IResource resource = (IResource) element;
- return resource.getParent();
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java
deleted file mode 100644
index 8c7e273..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java
+++ /dev/null
@@ -1,133 +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
- *
- * Derived from org.eclipse.search.internal.ui.FileLabelProvider
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import com.ibm.icu.text.MessageFormat;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.common.ui.internal.search.SearchMessages;
-
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-
-
-public class FileLabelProvider extends LabelProvider {
-
- public static final int SHOW_LABEL= 1;
- public static final int SHOW_LABEL_PATH= 2;
- public static final int SHOW_PATH_LABEL= 3;
- public static final int SHOW_PATH= 4;
-
- private static final String fgSeparatorFormat= "{0} - {1}"; //$NON-NLS-1$
-
- private WorkbenchLabelProvider fLabelProvider;
- private AbstractTextSearchViewPage fPage;
-
- private int fOrder;
- private String[] fArgs= new String[2];
-
- public FileLabelProvider(AbstractTextSearchViewPage page, int orderFlag) {
- fLabelProvider= new WorkbenchLabelProvider();
- fOrder= orderFlag;
- fPage= page;
- }
-
- public void setOrder(int orderFlag) {
- fOrder= orderFlag;
- }
-
- public int getOrder() {
- return fOrder;
- }
-
- public String getText(Object element) {
- if (!(element instanceof IResource))
- return null;
-
- IResource resource= (IResource)element;
- String text= null;
-
- if (!resource.exists())
- text= SearchMessages.FileLabelProvider_removed_resource_label;
-
- else {
- IPath path= resource.getFullPath().removeLastSegments(1);
- if (path.getDevice() == null)
- path= path.makeRelative();
- if (fOrder == SHOW_LABEL || fOrder == SHOW_LABEL_PATH) {
- text= fLabelProvider.getText(resource);
- if (path != null && fOrder == SHOW_LABEL_PATH) {
- fArgs[0]= text;
- fArgs[1]= path.toString();
- text= MessageFormat.format(fgSeparatorFormat, fArgs);
- }
- } else {
- if (path != null)
- text= path.toString();
- else
- text= ""; //$NON-NLS-1$
- if (fOrder == SHOW_PATH_LABEL) {
- fArgs[0]= text;
- fArgs[1]= fLabelProvider.getText(resource);
- text= MessageFormat.format(fgSeparatorFormat, fArgs);
- }
- }
- }
-
- int matchCount= 0;
- AbstractTextSearchResult result= fPage.getInput();
- if (result != null)
- matchCount= result.getMatchCount(element);
- if (matchCount <= 1)
- return text;
- String format= SearchMessages.FileLabelProvider_count_format;
- return MessageFormat.format(format, new Object[] { text, new Integer(matchCount) });
- }
-
- public Image getImage(Object element) {
- if (!(element instanceof IResource))
- return null;
-
- IResource resource= (IResource)element;
- Image image= fLabelProvider.getImage(resource);
- return image;
- }
-
- public void dispose() {
- super.dispose();
- fLabelProvider.dispose();
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return fLabelProvider.isLabelProperty(element, property);
- }
-
- public void removeListener(ILabelProviderListener listener) {
- super.removeListener(listener);
- fLabelProvider.removeListener(listener);
- }
-
- public void addListener(ILabelProviderListener listener) {
- super.addListener(listener);
- fLabelProvider.addListener(listener);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java
deleted file mode 100644
index 18ef416..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- * Derived from org.eclipse.search.internal.ui.IFileSearchContentProvider
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-public interface IFileSearchContentProvider {
-
- public abstract void elementsChanged(Object[] updatedElements);
-
- public abstract void clear();
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java
deleted file mode 100644
index 4e91dc7..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- * Derived from org.eclipse.search.internal.ui.Messages
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import com.ibm.icu.text.MessageFormat;
-
-/**
- * Helper class to format message strings.
- *
- * @since 3.1
- */
-public class Messages {
-
- public static String format(String message, Object object) {
- return MessageFormat.format(message, new Object[] { object});
- }
-
- public static String format(String message, Object[] objects) {
- return MessageFormat.format(message, objects);
- }
-
- private Messages() {
- // Not for instantiation
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java
deleted file mode 100644
index 835281a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java
+++ /dev/null
@@ -1,88 +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
- *
- * Derived from org.eclipse.search.internal.ui.ResourceTransferDragAdapter
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.swt.dnd.DragSourceAdapter;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.Transfer;
-
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.ui.part.ResourceTransfer;
-
-/**
- * A drag adapter that transfers the current selection as </code>
- * IResource</code>. Only those elements in the selection are part
- * of the transfer which can be converted into an <code>IResource
- * </code>.
- */
-public class ResourceTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
-
- private ISelectionProvider fProvider;
-
- /**
- * Creates a new ResourceTransferDragAdapter for the given selection
- * provider.
- *
- * @param provider the selection provider to access the viewer's selection
- */
- public ResourceTransferDragAdapter(ISelectionProvider provider) {
- fProvider= provider;
- Assert.isNotNull(fProvider);
- }
-
- public Transfer getTransfer() {
- return ResourceTransfer.getInstance();
- }
-
- public void dragStart(DragSourceEvent event) {
- event.doit= convertSelection().size() > 0;
- }
-
- public void dragSetData(DragSourceEvent event) {
- List resources= convertSelection();
- event.data= resources.toArray(new IResource[resources.size()]);
- }
-
- public void dragFinished(DragSourceEvent event) {
- if (!event.doit)
- return;
- }
-
- private List convertSelection() {
- ISelection s= fProvider.getSelection();
- if (!(s instanceof IStructuredSelection))
- return Collections.EMPTY_LIST;
- IStructuredSelection selection= (IStructuredSelection) s;
- List result= new ArrayList(selection.size());
- for (Iterator iter= selection.iterator(); iter.hasNext();) {
- Object element= iter.next();
- if (element instanceof IResource) {
- result.add(element);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java
deleted file mode 100644
index ae91ea2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java
+++ /dev/null
@@ -1,35 +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
- *
- * Derived from org.eclipse.search.internal.ui.SortAction
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.common.ui.internal.search.SearchResultPage;
-
-public class SortAction extends Action {
- private int fSortOrder;
- private SearchResultPage fPage;
-
- public SortAction(String label, SearchResultPage page, int sortOrder) {
- super(label);
- fPage= page;
- fSortOrder= sortOrder;
- }
-
- public void run() {
- fPage.setSortOrder(fSortOrder);
- }
-
- public int getSortOrder() {
- return fSortOrder;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java
deleted file mode 100644
index 01e158b..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java
+++ /dev/null
@@ -1,640 +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.common.ui.internal.search.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.ViewForm;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.Messages;
-
-
-public class ComponentSearchListDialog extends Dialog {
- private Display display = Display.getCurrent();
- private String dialogTitle;
-
- protected ComponentSearchListDialogConfiguration configuration;
- private List componentTableViewerInput;
- private List masterComponentList;
-
- // widgets
- protected Composite topComposite;
- protected Composite bottomComposite;
- private Text textFilter;
- protected TableViewer componentTableViewer;
-
- protected String fileLocationLabel = Messages._UI_LABEL_DECLARATION_LOCATION;
- protected ViewForm fileLocationView;
- protected CLabel locationLabel;
-
- // keep track of the item previously selected in the table
- private TableItem prevItem;
- private String prevItemText;
-
- protected Object componentSelection;
- protected Object qualifierTextSelection;
-
- protected ToolBar filterToolBar;
- protected ToolItem toolItem;
- protected MenuManager fMenuManager;
-
- protected HashMap TableDecoratorTrackingTool = new HashMap();
- private Button newButton;
-
-
- public ComponentSearchListDialog(Shell shell, String dialogTitle, ComponentSearchListDialogConfiguration configuration) {
- super(shell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- this.dialogTitle = dialogTitle;
- this.configuration = configuration;
- componentTableViewerInput = new ArrayList();
- masterComponentList = new ArrayList();
- configuration.init(this);
- }
-
- public void create() {
- super.create();
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- setTextFilterFocus();
- }
-
- protected void setTextFilterFocus() {
- textFilter.setFocus();
- }
-
- protected Control createDialogArea(Composite parent) {
- getShell().setText(dialogTitle);
-
- Composite mainComposite = (Composite) super.createDialogArea(parent);
- GridData gData = (GridData) mainComposite.getLayoutData();
- gData.heightHint = 500;
- gData.widthHint = 400;
-
- configuration.createWidgetAboveQualifierBox(mainComposite);
- // Subclasses may use this Composite to add desired widgets
- //topComposite = new Composite(mainComposite, SWT.NONE);
- //topComposite.setLayoutData(new GridData());
- //topComposite.setLayout(new GridLayout());
-
- // do we need to introduce a method here to contain this
- // so we can add different parent other than 'topComposite'
- Composite filterLabelAndText = new Composite(mainComposite, SWT.NONE);
- GridLayout layoutFilterLabelAndText = new GridLayout(2, false);
- layoutFilterLabelAndText.marginWidth = 0;
- layoutFilterLabelAndText.marginHeight = 0;
- filterLabelAndText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- filterLabelAndText.setLayout(layoutFilterLabelAndText);
-
- // Create Text textFilter
-
- Label filterLabel = new Label(filterLabelAndText, SWT.NONE);
- filterLabel.setText(configuration.getFilterLabelText());// + "(? = any character, * = any string):");
- GridData filterLabelData = new GridData();
- filterLabelData.horizontalSpan = 2;
- filterLabel.setLayoutData(filterLabelData);
-
- textFilter = new Text(filterLabelAndText, SWT.SINGLE | SWT.BORDER);
- textFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- textFilter.addModifyListener(new TextFilterModifyAdapter());
- GridData textFilterData = new GridData();
- textFilterData.horizontalAlignment = GridData.FILL;
- textFilterData.grabExcessHorizontalSpace = true;
- textFilter.setLayoutData(textFilterData);
-
- final INewComponentHandler handler = configuration.getNewComponentHandler();
- if (handler != null)
- {
- newButton = new Button(filterLabelAndText, SWT.NONE);
- newButton.setText(Messages._UI_LABEL_New);
- newButton.addSelectionListener(new SelectionListener()
- {
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handler.openNewComponentDialog();
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- handler.openNewComponentDialog();
- }
- });
- }
-
- // Create Component TableViewer
- createComponentTableViewer(mainComposite);
-
- configuration.createWidgetAboveQualifierBox(mainComposite);
-
- // Create Qualifier List widget
- Label qualifierLabel = new Label(mainComposite, SWT.NONE);
- qualifierLabel.setText(Messages._UI_LABEL_QUALIFIER);
- qualifierLabel.setText(fileLocationLabel);
-
- fileLocationView = new ViewForm(mainComposite, SWT.BORDER | SWT.FLAT );
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.heightHint = 22;
- fileLocationView.setLayoutData(data);
-
- locationLabel = new CLabel(fileLocationView, SWT.FLAT);
- fileLocationView.setContent(locationLabel);
- locationLabel.setFont(fileLocationView.getFont());
-
- configuration.createWidgetBelowQualifierBox(mainComposite);
-
- bottomComposite = new Composite(mainComposite, SWT.NONE);
- bottomComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- bottomComposite.setLayout(new GridLayout());
-
- // Populate the Component TableViewer via the provider
- // TODO: Is this the right way to set/get the ContentProvider?
- componentTableViewer.setContentProvider(new ComponentTableContentProvider());
- componentTableViewer.setLabelProvider(configuration.getDescriptionProvider().getLabelProvider());
- componentTableViewer.setSorter(new ViewerSorter());
- componentTableViewer.setInput(componentTableViewerInput);
-
-
- // TODO (cs) need to do some work to make the default search scope
- // more well defined, currently the default behaviour is to pass a null
- // argument in to populateMasterComponentList but we should provide
- // getters/setters to allow the default to be controlled
- populateMasterComponentList(null);
- refreshTableViewer("");
-
- return mainComposite;
- }
-
- /*
- * Creates the Component TableViewer.
- */
- private void createComponentTableViewer(Composite base) {
- componentTableViewer = createFilterMenuAndTableViewer(base);
-
- componentTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- //IStructuredSelection structuredSelection = (IStructuredSelection) event.getSelection();
- //List qualifiers = searchListProvider.getQualifiers(structuredSelection.getFirstElement());
- //updateQualifierList(qualifiers);
- updateCanFinish();
- }
- });
-
- componentTableViewer.getTable().addSelectionListener(new SelectionListener(){
- // Changing the text for the component selected and display its source
- // file in the box under the table viewer
-
- IComponentDescriptionProvider descriptionProvider = configuration.getDescriptionProvider();
- public void widgetSelected(SelectionEvent e) {
- run();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // bug 144548 - unnecessary
- // run();
- }
-
- private void run() {
- // restores the text of previous item
- if (prevItem != null && !prevItem.isDisposed()){
- prevItem.setText(prevItemText);
- }
- TableItem[] items = componentTableViewer.getTable().getSelection();
- Object component = items[0].getData();
-
- prevItem = items[0];
- prevItemText = items[0].getText();
-
- // add clarification for the first selected item
- items[0].setText( descriptionProvider.getName(component) + " - " +
- descriptionProvider.getQualifier(component));
-
- updateLocationView(component, descriptionProvider);
- }
- });
-
- componentTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-
- public void doubleClick(DoubleClickEvent event) {
- okPressed();
- }
-
- });
- }
-
- protected TableViewer createFilterMenuAndTableViewer(Composite comp) {
- Composite labelAndFilter = new Composite(comp, SWT.NONE);
- labelAndFilter.setLayoutData(new GridData(GridData.FILL_BOTH));
- GridLayout layout= new GridLayout();
- layout.numColumns= 2;
- layout.marginWidth= 0; layout.marginHeight= 0;
- labelAndFilter.setLayout(layout);
-
- Label tableLabel = new Label(labelAndFilter, SWT.NONE);
- tableLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- tableLabel.setText(configuration.getListLabelText());
-
- filterToolBar = new ToolBar(labelAndFilter,SWT.FLAT);
- configuration.createToolBarItems(filterToolBar);
-
- TableViewer tableViewer = new TableViewer(new Table(labelAndFilter, SWT.SINGLE | SWT.BORDER));
- Control TableWidget = tableViewer.getTable();
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 2;
- TableWidget.setLayoutData(gd);
-
- return tableViewer;
- }
-
- private void updateLocationView(Object component, IComponentDescriptionProvider lp) {
- IFile file = lp.getFile(component);
-
- if ( file == null ){
- locationLabel.setText("");
- locationLabel.setImage(null);
- return;
- }
- String filePath = "";
- filePath = file.getFullPath().toString();
- //locationView.redraw();
-
- locationLabel.setText(filePath);
- locationLabel.setImage(lp.getFileIcon(component));
- }
-
-
- /*
- * Returns the processed filter text for the Text field. Inserts a "."
- * before each supported meta-character.
- */
- protected String getProcessedFilterString() {
- return processFilterString(textFilter.getText());
- }
-
- /*
- * If supported metacharacters are used in the filter string, we need to
- * insert a "." before each metacharacter.
- */
- private String processFilterString(String inputString) {
- if (!(inputString.equals(""))) {
- inputString = insertString("*", ".", inputString);
- inputString = insertString("?", ".", inputString);
- inputString = inputString + ".*";
- } else {
- inputString = ".*";
- }
-
- return inputString.toLowerCase();
- }
-
- /*
- * Helper method to insert a "." before each metacharacter in the
- * search/filter string.
- */
- private String insertString(String target, String newString, String string) {
- StringBuffer stringBuffer = new StringBuffer(string);
-
- int index = stringBuffer.indexOf(target);
- while (index != -1) {
- stringBuffer = stringBuffer.insert(index, newString);
- index = stringBuffer.indexOf(target, index + newString.length() + target.length());
- }
-
- return stringBuffer.toString();
- }
-
-
-
- /*
- * Listens to changes made in the text filter widget
- */
- private class TextFilterModifyAdapter implements ModifyListener {
- public void modifyText(ModifyEvent e) {
- if (e.widget == textFilter) {
- if (delayedEvent != null) {
- delayedEvent.CANCEL = true;
- }
-
- delayedEvent = new DelayedEvent();
- Display.getCurrent().timerExec(400, delayedEvent);
- }
- }
- }
-
- //TODO... do we really need one instance?
- private DelayedEvent delayedEvent;
-
- /*
- * Update the component TableViewer when the text filter is modified.
- * Use a DelayedEvent so we don't update on every keystroke.
- */
- private class DelayedEvent implements Runnable {
- public boolean CANCEL = false;
-
- public void run() {
- if (!CANCEL) {
- refreshTableViewer(getProcessedFilterString());
-
- // Select first match
- if (componentTableViewer.getTable().getItemCount() > 0) {
- TableItem item = componentTableViewer.getTable().getItems()[0];
- TableItem items[] = new TableItem[1];
- items[0] = item;
- componentTableViewer.getTable().setSelection(items);
- }
-
- // Update qualifierList
- //IStructuredSelection structuredSelection = (IStructuredSelection) componentTableViewer.getSelection();
- // TODO ... manage qualifiers
- //List qualifiers = searchListProvider.getQualifiers(structuredSelection.getFirstElement());
- //updateQualifierList(qualifiers);
-
- updateCanFinish();
- }
- }
- }
-
- class ComponentList implements IComponentList {
- private Vector objectVector = new Vector();
- private long currentChangeCounter = 0;
- private long lastUpdateTime = 0;
-
- public void add(Object o) {
- objectVector.add(o);
- currentChangeCounter++;
- doViewerUpdate();
- }
-
- public void addAll(Collection collection)
- {
- objectVector.addAll(collection);
- currentChangeCounter += collection.size();
- doViewerUpdate();
- }
-
- private void doViewerUpdate() {
- // TODO: Investigate if we should also add a timer condition??
- // if (currentChangeCounter >= 10) {
- // currentChangeCounter = 0;
- // fireUpdateList(this);
- // }
-
- // cs: yep I think we really do need to use a time based approach
- //
- long time = System.currentTimeMillis();
- if (time - lastUpdateTime > 300)
- {
- lastUpdateTime = time;
- fireUpdateList(ComponentList.this);
- }
- }
-
- public int size() {
- return objectVector.size();
- }
-
- public List subList(int startIndex, int endIndex) {
- return objectVector.subList(startIndex, endIndex);
- }
-
- public Iterator iterator() {
- return objectVector.iterator();
- }
- }
-
-
- // this method gets called from a non-ui thread so needs to call
- // asyncExec to ensure the UI updates happen on the UI thread
- //
- protected void fireUpdateList(final ComponentList list) {
- Runnable runnable = new Runnable() {
- public void run(){
- // add new objects
- int growingListSize = list.size();
- int currentSize = masterComponentList.size();
- if (growingListSize > currentSize) {
- masterComponentList.addAll(list.subList(currentSize, growingListSize));
- }
-
- refreshTableViewer(getProcessedFilterString());
- }
- };
- display.asyncExec(runnable);
- }
-
-
- public void updateForFilterChange()
- {
- populateMasterComponentList(null);
- refreshTableViewer(getProcessedFilterString());
- }
-
- /*
- * Populate the Component TreeViewer with items.
- */
- protected void populateMasterComponentList(final SearchScope searchScope) {
- masterComponentList.clear();
-
- final ComponentList componentList = new ComponentList();
-
- // TODO (cs) it doesn't seem to make sennse to do any of the work on the UI thread
- // I've change the behaviour here to do all of the work in the background
- //
- //searchListProvider._populateComponentListQuick(componentList, 0);
- Job job = new Job("read components") {
- protected IStatus run(IProgressMonitor monitor) {
- try {
- // this stuff gets executed on a non-UI thread
- //
- long time1 = System.currentTimeMillis();
- configuration.getSearchListProvider().populateComponentList(componentList, searchScope, null);
- // Do a final update of our Input for the component tree viewer.
- fireUpdateList(componentList);
- long time2 = System.currentTimeMillis();
- System.out.println("time=" + (time2 - time1) + " items= " + masterComponentList.size());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return Status.OK_STATUS;
- }
- };
- job.schedule();
- }
-
- protected void refreshTableViewer(String filterText) {
- componentTableViewerInput.clear();
- ILabelProvider labelProvider = configuration.getDescriptionProvider().getLabelProvider();
- Pattern regex = Pattern.compile(filterText);
- Iterator it = masterComponentList.iterator();
- while (it.hasNext()) {
- Object item = it.next();
- String itemString = labelProvider.getText(item);
- Matcher m = regex.matcher(itemString.toLowerCase());
- if (itemString.toLowerCase().startsWith(filterText) || m.matches()) {
- componentTableViewerInput.add(item);
- }
- }
-
- componentTableViewer.refresh();
- decorateTable();
- }
-
- /**
- * Looking at each item in the Table. If there are other items with same name
- * , then add extra info (namespace, file) into the the text label of all these
- * duplicated items.
- * - This should be called everytime the Table viewer is refreshed..
- */
- protected void decorateTable(){
- TableDecoratorTrackingTool.clear();
-
- IComponentDescriptionProvider lp = configuration.getDescriptionProvider();
-
- // init the name-duplicates counter
- for (int i = 0; i < componentTableViewerInput.size(); i++){
- Object currentItem = componentTableViewerInput.get(i);
- String name = lp.getName(currentItem);
- Integer count = (Integer) TableDecoratorTrackingTool.get(name);
- if ( count == null){
- TableDecoratorTrackingTool.put(name, new Integer(1));
- }
- else{
- TableDecoratorTrackingTool.put(
- name, new Integer(count.intValue() + 1));
- }
- }
-
- // Modify/decorate those items in the Table that have duplicated name
- TableItem[] items = componentTableViewer.getTable().getItems();
- for (int i =0 ; i < items.length; i++){
- Object currentItem = items[i].getData();
- Integer count = (Integer) TableDecoratorTrackingTool.get(lp.getName(currentItem));
- if ( count != null && count.intValue() > 1){
- items[i].setText(lp.getName(currentItem) + " - " +
- lp.getQualifier(currentItem));
- }
- }
- }
-
-
-
- /*
- * If there is a selection in the ComponentTreeViewer, enable OK
- */
- protected void updateCanFinish() {
- IStructuredSelection selection = (IStructuredSelection) componentTableViewer.getSelection();
- if (selection.getFirstElement() != null) {
- getButton(IDialogConstants.OK_ID).setEnabled(true);
- }
- else {
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- }
- }
-
- protected void okPressed() {
- IStructuredSelection selection = (IStructuredSelection) componentTableViewer.getSelection();
- componentSelection = selection.getFirstElement();
-
- super.okPressed();
- }
-
- private class ComponentTableContentProvider implements ITreeContentProvider {
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof List) {
- return ((List) parentElement).toArray();
- }
- return new Object[0];
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (getChildren(element).length > 0) {
- return true;
- }
- return false;
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
- }
-
-
- public ComponentSpecification getSelectedComponent()
- {
- ComponentSpecification result = null;
- if (componentSelection != null)
- {
- result = new ComponentSpecification();
- IComponentDescriptionProvider componentDescriptionProvider = configuration.getDescriptionProvider();
- result.setName(componentDescriptionProvider.getName(componentSelection));
- result.setQualifier(componentDescriptionProvider.getQualifier(componentSelection));
- result.setFile(componentDescriptionProvider.getFile(componentSelection));
- result.setObject(componentSelection);
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialogConfiguration.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialogConfiguration.java
deleted file mode 100644
index 8371108..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialogConfiguration.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.dialogs;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.wst.common.ui.internal.Messages;
-
-public class ComponentSearchListDialogConfiguration
-{
- private String filterLabelText = Messages._UI_LABEL_COMPONENT_NAME;
- private String listLabelText = Messages._UI_LABEL_COMPONENTS;
- private IComponentSearchListProvider searchListProvider;
- private IComponentDescriptionProvider descriptionProvider;
- private INewComponentHandler newComponentHandler;
- private ComponentSearchListDialog dialog;
-
- public void init(ComponentSearchListDialog dialog)
- {
- this.dialog = dialog;
- }
-
- public void createWidgetAtTop(Composite parent)
- {
- }
-
- public void createWidgetAboveQualifierBox(Composite parent)
- {
- }
-
- public void createWidgetBelowQualifierBox(Composite parent)
- {
- }
-
- public void createToolBarItems(ToolBar toolBar)
- {
- }
-
- public IComponentDescriptionProvider getDescriptionProvider()
- {
- return descriptionProvider;
- }
-
- public void setDescriptionProvider(IComponentDescriptionProvider descriptionProvider)
- {
- this.descriptionProvider = descriptionProvider;
- }
-
- public IComponentSearchListProvider getSearchListProvider()
- {
- return searchListProvider;
- }
-
- public void setSearchListProvider(IComponentSearchListProvider searchListProvider)
- {
- this.searchListProvider = searchListProvider;
- }
-
- public ComponentSearchListDialog getDialog()
- {
- return dialog;
- }
-
- public INewComponentHandler getNewComponentHandler()
- {
- return newComponentHandler;
- }
-
- public void setNewComponentHandler(INewComponentHandler newComponentHandler)
- {
- this.newComponentHandler = newComponentHandler;
- }
-
- public String getFilterLabelText()
- {
- return filterLabelText;
- }
-
- public String getListLabelText()
- {
- return listLabelText;
- }
-
- public void setFilterLabelText(String filterLabelText)
- {
- this.filterLabelText = filterLabelText;
- }
-
- public void setListLabelText(String listLabelText)
- {
- this.listLabelText = listLabelText;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSpecification.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSpecification.java
deleted file mode 100644
index b7cabd1..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSpecification.java
+++ /dev/null
@@ -1,98 +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.common.ui.internal.search.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-
-// TODO.. use QualifiedName consistently for name and metaName
-//
-public class ComponentSpecification
-{
- String qualifier;
- String name;
- IFile file;
- Object object;
- boolean isNew;
- QualifiedName metaName;
-
- public ComponentSpecification()
- {
- }
-
- public ComponentSpecification(String qualifier, String name, IFile file)
- {
- super();
- this.qualifier = qualifier;
- this.name = name;
- this.file = file;
- }
-
- public IFile getFile()
- {
- return file;
- }
-
- public void setFile(IFile file)
- {
- this.file = file;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getQualifier()
- {
- return qualifier;
- }
-
- public void setQualifier(String qualifier)
- {
- this.qualifier = qualifier;
- }
-
- public Object getObject()
- {
- return object;
- }
-
- public void setObject(Object object)
- {
- this.object = object;
- }
-
- public boolean isNew()
- {
- return isNew;
- }
-
- public void setNew(boolean isNew)
- {
- this.isNew = isNew;
- }
-
- public QualifiedName getMetaName()
- {
- return metaName;
- }
-
- public void setMetaName(QualifiedName metaName)
- {
- this.metaName = metaName;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentDescriptionProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentDescriptionProvider.java
deleted file mode 100644
index 6389ff6..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentDescriptionProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-public interface IComponentDescriptionProvider
-{
- boolean isApplicable(Object component);
-
- String getQualifier(Object component);
-
- String getName(Object component);
-
- IFile getFile(Object component);
-
- Image getFileIcon(Object component);
-
- ILabelProvider getLabelProvider();
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentList.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentList.java
deleted file mode 100644
index 0fa248a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentList.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.dialogs;
-
-import java.util.Iterator;
-
-public interface IComponentList {
- public void add(Object o);
- public Iterator iterator();
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentSearchListProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentSearchListProvider.java
deleted file mode 100644
index 66a79ad..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/IComponentSearchListProvider.java
+++ /dev/null
@@ -1,20 +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.common.ui.internal.search.dialogs;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-
-
-public interface IComponentSearchListProvider
-{
- void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm);
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/INewComponentHandler.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/INewComponentHandler.java
deleted file mode 100644
index 7a5093f..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/INewComponentHandler.java
+++ /dev/null
@@ -1,16 +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.common.ui.internal.search.dialogs;
-
-public interface INewComponentHandler
-{
- void openNewComponentDialog();
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java
deleted file mode 100644
index 4bf7d8d..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.dialogs;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-import org.eclipse.wst.common.core.search.scope.ProjectSearchScope;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkingSetSearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkspaceSearchScope;
-import org.eclipse.wst.common.ui.internal.Messages;
-
-public class ScopedComponentSearchListDialog extends ComponentSearchListDialog
-{
- protected final static String DEFAULT_NAME_FIELD_TITLE = Messages._UI_LABEL_COMPONENT_NAME;
- protected final static String DEFAULT_LIST_TITLE = Messages._UI_LABEL_MATCHING_COMPONENTS;
- public static final String SCOPE_SPECIFIED_FILE = Messages._UI_LABEL_SPECIFIED_FILE;
- public static final String SCOPE_ENCLOSING_PROJECT = Messages._UI_LABEL_ENCLOSING_PROJECT;
- public static final String SCOPE_WORKSPACE = Messages._UI_LABEL_WORKSPACE;
- public static final String SCOPE_CURRENT_RESOURCE = Messages._UI_LABEL_CURRENT_RESOURCE;
- public static final String SCOPE_WORKING_SETS = Messages._UI_LABEL_WORKING_SETS;
-
- private String currentSearchScope = SCOPE_CURRENT_RESOURCE;
- protected Button chooseButton;
- protected Button[] radioButton = new Button[4];
- protected String filterLabel;
- protected String listTitle;
- protected IResource currentResource;
- protected Composite selectWorkingSetsGroup;
- protected Text workingSetsText;
-
- protected static String valueForWorkingSetsText;
-
- // working sets currently chosen by the user
- private static IWorkingSet[] workingSets;
-
- public ScopedComponentSearchListDialog(Shell shell, String dialogTitle, ComponentSearchListDialogConfiguration configuration)
- {
- super(shell, dialogTitle, configuration);
- }
-
- public void setFilterLabel(String filterLabel)
- {
- this.filterLabel = filterLabel;
- }
-
- public void setListTitle(String listTitle)
- {
- this.listTitle = listTitle;
- }
-
- protected Control createDialogArea(Composite parent)
- {
- //super.setFilterLabel(filterLabel != null ? filterLabel : DEFAULT_NAME_FIELD_TITLE);
- //setListLabelText(listTitle != null ? listTitle : DEFAULT_LIST_TITLE);
- super.createDialogArea(parent);
- // We use the Composite topComposite to create additional widgets
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- bottomComposite.setLayout(layout);
- Group group = new Group(bottomComposite, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- // gridLayout.marginWidth = 0;
- // gridLayout.marginLeft = 2;
- group.setLayout(gridLayout);
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- group.setText(Messages._UI_LABEL_SEARCH_SCOPE);
- ScopeChangeListener scopeChangeListener = new ScopeChangeListener();
- radioButton[0] = new Button(group, SWT.RADIO);
- radioButton[0].setText(SCOPE_WORKSPACE);
- radioButton[1] = new Button(group, SWT.RADIO);
- radioButton[1].setText(SCOPE_ENCLOSING_PROJECT);
- radioButton[2] = new Button(group, SWT.RADIO);
- radioButton[2].setText(SCOPE_CURRENT_RESOURCE);
- radioButton[3] = new Button(group, SWT.RADIO);
- radioButton[3].setText(SCOPE_WORKING_SETS);
- for (int i = 0; i < radioButton.length; i++)
- {
- if (radioButton[i].getText().equals(currentSearchScope))
- {
- radioButton[i].setSelection(true);
- }
- radioButton[i].addSelectionListener(scopeChangeListener);
- }
-
- selectWorkingSetsGroup = new Composite(group, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- selectWorkingSetsGroup.setLayoutData(gd);
- GridLayout workingSetGroupLayout = new GridLayout(2, false);
- workingSetGroupLayout.marginWidth = 0;
- workingSetGroupLayout.marginHeight = 0;
- selectWorkingSetsGroup.setLayout(workingSetGroupLayout);
-
- workingSetsText = new Text(selectWorkingSetsGroup, SWT.BORDER | SWT.READ_ONLY);
- workingSetsText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- if (valueForWorkingSetsText != null )
- workingSetsText.setText(valueForWorkingSetsText);
-
- chooseButton = new Button(selectWorkingSetsGroup, SWT.NONE);
- chooseButton.setText(Messages._UI_LABEL_CHOOSE);
- chooseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- Shell shell = getShell();
- IWorkingSetSelectionDialog dialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(shell, true);
- if ( dialog.open() == Window.OK){
- workingSets = dialog.getSelection();
- valueForWorkingSetsText = "";
- for (int i = 0; i < workingSets.length; i++){
- valueForWorkingSetsText += workingSets[i].getLabel();
- // if not the last item, we add a comma
- if ( i != workingSets.length - 1)
- valueForWorkingSetsText += ", ";
- }
- workingSetsText.setText(valueForWorkingSetsText);
- }
- // Set working sets radio button enabled, disable other buttons
- radioButton[2].setSelection(false);
- radioButton[1].setSelection(false);
- radioButton[0].setSelection(false);
- radioButton[3].setSelection(true);
-
- scopeChangeHandler(radioButton[3]);
- }
- });
-
- return parent;
- } /*
- * Returns the selected search scope.
- */
-
- public String getSearchScope()
- {
- return currentSearchScope;
- }
-
-private void scopeChangeHandler(Button b) {
- if ((b.getStyle() & SWT.RADIO) != 0)
- {
- currentSearchScope = b.getText();
-
- // TODO (cs) need to do some work to make the default search scope
- // more well defined, currently the default behaviour is to pass a null
- // argument in to populateMasterComponentList but we should provide
- // getters/setters to allow the default to be controlled
- SearchScope scope = null;
- if (currentSearchScope == SCOPE_ENCLOSING_PROJECT &&
- currentResource != null) {
- scope = new ProjectSearchScope(currentResource.getFullPath());
- }
- else if (currentSearchScope == SCOPE_WORKSPACE){
- scope = new WorkspaceSearchScope();
- }
- else if (currentSearchScope == SCOPE_WORKING_SETS){
-
- // Constructs the working sets scope from the working sets the user
- // selected
- WorkingSetSearchScope workingSetsScope = new WorkingSetSearchScope();
- for (int i = 0; i < workingSets.length; i++){
- workingSetsScope.addAWorkingSetToScope(workingSets[i].getElements());
- }
- scope = workingSetsScope;
- }
-
- populateMasterComponentList(scope);
- refreshTableViewer(getProcessedFilterString());
- // Select the first matching component. Though we should be
- // smarter here
- // and determine if there was a selection before the scope
- // switch (and if
- // the component is still available.
- Table table = componentTableViewer.getTable();
- TableItem items[] = table.getItems();
- if (items.length > 0)
- {
- TableItem select[] = new TableItem[1];
- select[0] = items[0];
- table.setSelection(select);
- }
- updateCanFinish();
- }
- }
-
-private class ScopeChangeListener extends SelectionAdapter
- {
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget instanceof Button)
- {
- Button b = (Button) e.widget;
- if (b.getSelection())
- {
- scopeChangeHandler(b);
- }
- }
- }
- }
-
- public IResource getCurrentResource()
- {
- return currentResource;
- }
-
- public void setCurrentResource(IResource currentResource)
- {
- this.currentResource = currentResource;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/Test.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/Test.java
deleted file mode 100644
index d9883c2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/Test.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-
-public class Test extends ActionDelegate
-{
- public void run(IAction action)
- {
- try
- {
- ComponentSearchListDialogConfiguration configuration = new ComponentSearchListDialogConfiguration();
- configuration.setListLabelText("List:");
- configuration.setFilterLabelText("Filter:");
- configuration.setSearchListProvider(searchListProvider);
- configuration.setDescriptionProvider(new BaseComponentDescriptionProvider("foo"));
- Shell shell = Display.getCurrent().getActiveShell();
- ComponentSearchListDialog dialog = new ComponentSearchListDialog(shell, "test", configuration);
- dialog.setBlockOnOpen(true);
- dialog.create();
- dialog.open();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- class BaseComponentDescriptionProvider extends LabelProvider implements IComponentDescriptionProvider
- {
- String prefix;
-
- BaseComponentDescriptionProvider(String prefix)
- {
- this.prefix = prefix;
- }
-
- public IFile getFile(Object component)
- {
- return null;
- }
-
- public ILabelProvider getLabelProvider()
- {
- return this;
- }
-
- public String getName(Object component)
- {
- String string = (String) component;
- return string.substring(prefix.length() + 1);
- }
-
- public String getQualifier(Object component)
- {
- return prefix;
- }
-
- public String getText(Object element)
- {
- return getName(element);
- }
-
- public boolean isApplicable(Object component)
- {
- if (component instanceof String)
- {
- return ((String) component).startsWith(prefix);
- }
- return false;
- }
-
- public Image getFileIcon(Object component) {
- return null;
- }
- }
-
- IComponentSearchListProvider searchListProvider = new IComponentSearchListProvider()
- {
- public void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm)
- {
- list.add("foo:" + "Hello!");
- list.add("foo:" + "Hey!");
- list.add("foo:" + "How-are-you?");
- list.add("foo:" + "What-is-that-smell?");
- }
- };
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java
deleted file mode 100644
index ce13bb8..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java
+++ /dev/null
@@ -1,176 +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.common.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages {
- private static final String BUNDLE_NAME = "plugin"; //$NON-NLS-1$
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class); //$NON-NLS-1$
- }
-
-// SelectSingleFilePage and SelectMultiFilePage
- public static String _UI_LABEL_SOURCE_FILES;
- public static String _UI_LABEL_SELECTED_FILES;
-
- public static String _UI_POPUP_EXPAND_ALL;
- public static String _UI_POPUP_COLLAPSE_ALL;
-
- public static String _UI_IMPORT_BUTTON;
- public static String _UI_IMPORT_BUTTON_TOOL_TIP;
-
-// SelectMultiFilePage
- public static String _UI_ADD_BUTTON_TOOL_TIP;
- public static String _UI_REMOVE_BUTTON_TOOL_TIP;
- public static String _UI_REMOVE_ALL_BUTTON_TOOL_TIP;
-
- public static String _UI_ADD_BUTTON;
- public static String _UI_REMOVE_BUTTON;
- public static String _UI_REMOVE_ALL_BUTTON;
-
-// SelectJavaProjectView
- public static String _UI_LABEL_CHOOSE_FOLDER;
-
-// SelectJavaProjectDialog
- public static String _UI_LABEL_FOLDER_SELECTION;
-
-// TextViewerOperationAction
- public static String _UI_MENU_COPY;
- public static String _UI_MENU_CUT;
- public static String _UI_MENU_DELETE;
- public static String _UI_MENU_PASTE;
- public static String _UI_MENU_PREFIX;
- public static String _UI_MENU_REDO;
- public static String _UI_MENU_SELECT_ALL;
- public static String _UI_MENU_SHIFT_LEFT;
- public static String _UI_MENU_SHIFT_RIGHT;
- public static String _UI_MENU_STRIP_PREFIX;
- public static String _UI_MENU_UNDO;
-
-// SourceViewerGotoLineAction
- public static String _UI_MENU_GOTO_LINE;
- public static String _UI_GOTO_LINE_DIALOG_TITLE;
- public static String _UI_GOTO_LINE_DIALOG_TEXT;
-
- public static String _UI_FILE_CHANGED_TITLE;
- public static String _UI_FILE_DELETED_SAVE_CHANGES;
- public static String _UI_FILE_DELETED_EDITOR_CLOSED;
- public static String _UI_FILE_CHANGED_LOAD_CHANGES;
- public static String _UI_SAVE_BUTTON;
- public static String _UI_CLOSE_BUTTON;
-
-
-// XSL Prefererence
- public static String _UI_XSLT_SELECT;
- public static String _UI_XSLT_STYLESHEET;
- public static String _UI_XSLT_TRANSFORM;
-
-// XSL Debug Prefererence
- public static String _UI_XSL_DEBUG_SELECT_LAUNCHER;
- public static String _UI_XSL_DEBUG_LOCAL;
- public static String _UI_XSL_DEBUG_REMOTE;
- public static String _UI_XSL_TILE_EDITOR;
- public static String _UI_XSL_DEBUG_AND_TRANSFORM;
- public static String _UI_XSL_CONTEXT_URI;
- public static String _UI_XSL_CONTEXT;
-
-
- public static String _UI_OVERRIDE_FILE;
- public static String _UI_JAVA_EXIST_FILE1;
- public static String _UI_JAVA_EXIST_FILE2;
-
-// some options strings common to several plugins
- public static String _UI_ERROR_CREATING_FILE_TITLE;
- public static String _UI_ERROR_CREATING_FILE_SHORT_DESC;
- public static String _UI_ERROR_CREATING_FILE_LONG_DESC;
- public static String _UI_PARENT_FOLDER_IS_READ_ONLY;
- public static String _UI_UNKNOWN_ERROR_WITH_HINT;
- public static String _UI_UNKNOWN_ERROR;
-
-// usage - this label is followed by two radio button options for the file location
- public static String _UI_LABEL_INCLUDE_URL_FILE;
- public static String _UI_RADIO_FILE;
- public static String _UI_RADIO_URL;
-
- public static String _UI_LABEL_COMPONENTS;
- public static String _UI_LABEL_QUALIFIER;
-
-// - component selection dialogs
- public static String _UI_LABEL_COMPONENT_NAME;
- public static String _UI_LABEL_MATCHING_COMPONENTS;
- public static String _UI_LABEL_SPECIFIED_FILE;
- public static String _UI_LABEL_ENCLOSING_PROJECT;
- public static String _UI_LABEL_WORKSPACE;
- public static String _UI_LABEL_CURRENT_RESOURCE;
- public static String _UI_LABEL_SEARCH_SCOPE;
- public static String _UI_LABEL_NARROW_SEARCH_SCOPE_RESOURCE;
- public static String _UI_LABEL_AVAILABLE_TYPES;
- public static String _UI_LABEL_WORKING_SETS;
-
- public static String _UI_LABEL_New;
- public static String _UI_LABEL_DECLARATION_LOCATION;
- public static String _UI_LABEL_CHOOSE;
-
-
-
-
-
-
- /*======================================================================================
- !
- ! Here is the list of Error string that have message IDs - make sure they are unique
- ! Range for b2bgui messageIDs: IWAX1201 - IWAX1400
- !
- !======================================================================================*/
- public static String _ERROR_THE_CONTAINER_NAME;
-
- public static String _ERROR_LOCAL_LOCATION;
- public static String _ERROR_NOT_JAVA_PROJECT;
-
-// NOTE TO TRANSLATOR: this error message text is followed by a message from another plugin
- public static String _ERROR_INVALID_JAVA_PACKAGE;
-
-// NOTE TO TRANSLATOR: (_ERROR_BAD_FILENAME_EXTENSION + string + _UI_LABEL_OR + string) or (_ERROR_BAD_FILENAME_EXTENSION)
- public static String _ERROR_BAD_FILENAME_EXTENSION;
- public static String _ERROR_FILE_ALREADY_EXISTS;
-
- public static String _ERROR_CONTAINER_NOT_JAVA_BUILDPATH;
- public static String _ERROR_USE_PROJECT_JAVA_SOURCE_FOLDER;
-
- public static String _UI_ERROR;
-
- public static String _ERROR_ROOT_ELEMENT;
- public static String _ERROR_SAVING_FILE;
-
-// File Validator
- public static String _UI_ERROR_VALIDATE_FAIL_TITLE;
- public static String _UI_ERROR_VALIDATE_FAIL_MESSAGE;
-
-// PropertyDirtyChangeListener and PropertyResourceChangeListener
- public static String _UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE;
-
-// public static String ExampleProjectCreationWizard.title;
-// public static String ExampleProjectCreationWizard.op_error.title;
-// public static String ExampleProjectCreationWizard.op_error.message;
-//
-// public static String ExampleProjectCreationWizard.overwritequery.title;
-// public static String ExampleProjectCreationWizard.overwritequery.message;
-//
-//
-// public static String ExampleProjectCreationOperation.op_desc;
-// public static String ExampleProjectCreationOperation.op_desc_proj;
-//
-// public static String ExampleProjectCreationWizardPage.error.alreadyexists;
- public static String SaveFilesDialog_save_all_resources;
- public static String SaveFilesDialog_must_save;
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/UIPlugin.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/UIPlugin.java
deleted file mode 100644
index fafc278..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/UIPlugin.java
+++ /dev/null
@@ -1,175 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-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.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UIPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static UIPlugin plugin;
-
- /**
- * The constructor.
- */
- public UIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static UIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle aResourceBundle = getDefault().getResourceBundle();
- try {
- return (aResourceBundle != null) ? aResourceBundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static String getString(String key)
- {
- return getResourceString(key);
- }
- /**
- * This gets the string resource and does one substitution.
- */
- public static String getString(String key, Object s1)
- {
- return MessageFormat.format(getResourceString(key), new Object [] { s1 });
- }
-
- /**
- * This gets the string resource and does two substitutions.
- */
- public static String getString(String key, Object s1, Object s2)
- {
- return MessageFormat.format(getResourceString(key), new Object [] { s1, s2 });
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- return Platform.getResourceBundle(plugin.getBundle());
- } catch (MissingResourceException x) {
- log(x);
- }
- return null;
- }
-
- public ImageDescriptor getImageDescriptor(String name) {
- try {
- URL url= new URL(getBundle().getEntry("/"), name);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-
- public Image getImage(String iconName)
- {
- ImageRegistry imageRegistry = getImageRegistry();
-
- if (imageRegistry.get(iconName) != null)
- {
- return imageRegistry.get(iconName);
- }
- else
- {
- imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
- return imageRegistry.get(iconName);
- }
- }
-
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void log(String message, Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, e));
- }
-
- public static void log(String message) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
- }
-
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, e.getLocalizedMessage(), e));
- }
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- // TODO Auto-generated method stub
- super.start(context);
- }
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- // TODO Auto-generated method stub
- super.stop(context);
- }
-
- public static IWorkbenchPage getActivePage() {
- return getDefault().internalGetActivePage();
- }
-
- private IWorkbenchPage internalGetActivePage() {
- IWorkbenchWindow window= getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- return getWorkbench().getActiveWorkbenchWindow().getActivePage();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SaveDirtyFilesDialog.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SaveDirtyFilesDialog.java
deleted file mode 100644
index ae180fd..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SaveDirtyFilesDialog.java
+++ /dev/null
@@ -1,157 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- */
-package org.eclipse.wst.common.ui.internal.dialogs;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.graphics.Image;
-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.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.wst.common.ui.internal.Messages;
-/**
- * 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 SaveDirtyFilesDialog extends ListDialog
-{
- public static boolean saveDirtyFiles()
- {
- boolean result = true;
- // TODO (cs) add support for save automatically
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- IEditorPart[] dirtyEditors = getDirtyEditors();
- if (dirtyEditors.length > 0)
- {
- result = false;
- SaveDirtyFilesDialog saveDirtyFilesDialog = new SaveDirtyFilesDialog(shell);
- saveDirtyFilesDialog.setInput(Arrays.asList(dirtyEditors));
- // Save all open editors.
- if (saveDirtyFilesDialog.open() == Window.OK)
- {
- result = true;
- int numDirtyEditors = dirtyEditors.length;
- for (int i = 0; i < numDirtyEditors; i++)
- {
- dirtyEditors[i].doSave(null);
- }
- }
- }
- return result;
- }
-
- private static IEditorPart[] getDirtyEditors()
- {
- List result = new ArrayList(0);
- 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];
- result.add(ep);
- }
- }
- }
- return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
- }
-
- public SaveDirtyFilesDialog(Shell parent)
- {
- super(parent);
- setTitle(Messages.SaveFilesDialog_save_all_resources);
- setAddCancelButton(true);
- setLabelProvider(createDialogLabelProvider());
- setMessage(Messages.SaveFilesDialog_must_save);
- setContentProvider(new ListContentProvider());
- }
-
- protected Control createDialogArea(Composite container)
- {
- Composite result = (Composite) super.createDialogArea(container);
- // TODO... provide preference that supports 'always save'
- 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();
- }
- };
- }
-
- /**
- * 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.
- */
- private static 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.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java
deleted file mode 100644
index 03503e8..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java
+++ /dev/null
@@ -1,135 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-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.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView;
-
-
-
-public class SelectSingleFileDialog extends TitleAreaDialog {
- protected SelectSingleFileView selectSingleFileView;
- protected Button okButton;
- protected Image image;
- private ImageDescriptor imageDescriptor;
-
- public SelectSingleFileDialog(Shell parentShell, IStructuredSelection selection, boolean isFileMandatory) {
- super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- if (selection == null) {
- selection = new StructuredSelection();
- }
- selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory) {
- public void createFilterControl(Composite composite) {
- SelectSingleFileDialog.this.createFilterControl(composite);
- }
- };
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite dialogArea = (Composite) super.createDialogArea(parent);
-
- // TODO.. enable context help
- // WorkbenchHelp.setHelp(dialogArea,
- // B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_DIALOG);
-
- Composite composite = new Composite(dialogArea, SWT.NONE);
- composite.setLayout(new GridLayout());
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = 350;
- gd.heightHint = 350;
- composite.setLayoutData(gd);
-
- SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener() {
- public void setControlComplete(boolean isComplete) {
- okButton.setEnabled(isComplete);
- }
- };
- selectSingleFileView.setListener(listener);
- selectSingleFileView.createControl(composite);
- return dialogArea;
- }
-
- protected void createButtonsForButtonBar(Composite parent) {
- okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
- okButton.setEnabled(false);
- createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
- }
-
- public void create() {
- super.create();
- selectSingleFileView.setVisibleHelper(true);
- image = getSaveAsImage();
- setTitleImage(image);
- }
-
- /**
- * this image was copied from org.eclipse.ui.ide/icons/full/wizban/ where
- * it is a non-API image, denoted by
- * IDEInternalWorkbenchImages.IMG_DLGBAN_SAVEAS_DLG.
- */
- private Image getSaveAsImage() {
- Image localimage = null;
- try {
- if (imageDescriptor == null) {
- imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/saveas_wiz.png");
- }
- localimage = (Image) imageDescriptor.createResource(getContents().getDisplay());
- }
- catch (DeviceResourceException e) {
- // if image not found
- localimage = (ImageDescriptor.getMissingImageDescriptor()).createImage();
- }
- return localimage;
- }
-
- public void createFilterCombo(Composite composite) {
- }
-
- public IFile getFile() {
- return selectSingleFileView.getFile();
- }
-
- public void addFilterExtensions(String[] filterExtensions) {
- selectSingleFileView.addFilterExtensions(filterExtensions);
- }
-
- public void addFilterExtensions(String[] filterExtensions, IFile[] excludedFiles) {
- selectSingleFileView.addFilterExtensions(filterExtensions, excludedFiles);
- }
-
- public void createFilterControl(Composite composite) {
- }
-
- public boolean close() {
- if (image != null && imageDescriptor != null) {
- imageDescriptor.destroyResource(image);
- image = null;
- }
- return super.close();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DefaultDragAndDropCommand.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DefaultDragAndDropCommand.java
deleted file mode 100644
index 9631e6a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DefaultDragAndDropCommand.java
+++ /dev/null
@@ -1,110 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.swt.dnd.DND;
-
-
-abstract public class DefaultDragAndDropCommand implements DragAndDropCommand
-{
- /**
- * This keeps track of the owner that is the target of the drag and drop.
- */
- protected Object target;
-
- /**
- * This keeps track of the location of the drag and drop.
- */
- protected float location;
-
- /**
- * This keeps track of the lower range of locations in which the effect of this command remains unchanged.
- */
- protected float lowerLocationBound;
-
- /**
- * This keeps track of the upper range of locations in which the effect of this command remains unchanged.
- */
- protected float upperLocationBound;
-
- /**
- * This keeps track of the permitted operations.
- */
- protected int operations;
-
- /**
- * This keeps track of the current operation that will be returned by {@link #getOperation}.
- */
- protected int operation;
-
- /**
- * This keeps track of the feedback that will be returned by {@link #getFeedback}.
- */
- protected int feedback;
-
- /**
- * This keeps track of the collection of dragged sources.
- */
- protected Collection sources;
-
- public DefaultDragAndDropCommand(Object target, float location, int operations, int operation, Collection sources)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.sources = new ArrayList(sources);
- if (!canExecute())
- {
- this.operation = DND.DROP_NONE;
- }
-
- }
-
- public int getFeedback()
- {
- if (isAfter())
- {
- return DND.FEEDBACK_INSERT_AFTER;
- }
- else
- {
- return DND.FEEDBACK_INSERT_BEFORE;
- }
- }
-
- public boolean isAfter()
- {
- return location > 0.5;
- }
-
- public int getOperation()
- {
- return operation;
- }
-
- public void reinitialize(Object target, float location, int operations, int operation, Collection sources)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.sources = new ArrayList(sources);
- if (!canExecute())
- {
- this.operation = DND.DROP_NONE;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropCommand.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropCommand.java
deleted file mode 100644
index 0ceb414..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropCommand.java
+++ /dev/null
@@ -1,29 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-import java.util.Collection;
-
-public interface DragAndDropCommand
-{
- // public DragAndDropCommand(Object target, float location, int operations, int operation, Collection sources);
-
- public boolean canExecute();
-
- public void execute();
-
- public int getFeedback();
-
- public int getOperation();
-
- public void reinitialize(Object target, float location, int operations, int operation, Collection sources);
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropManager.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropManager.java
deleted file mode 100644
index 013a5b2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/DragAndDropManager.java
+++ /dev/null
@@ -1,19 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-import java.util.Collection;
-
-public interface DragAndDropManager
-{
- public DragAndDropCommand createCommand(Object target, float location, int operations, int operation, Collection source);
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ObjectTransfer.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ObjectTransfer.java
deleted file mode 100644
index 684eafa..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ObjectTransfer.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.TransferData;
-
-
-/**
- * This derived implementation of a byte array transfer short circuits the transfer process
- * so that a local transfer does not serialize the object
- * and hence can and will return the original object, not just a clone.
- * You only really need ever know about {@link #getInstance ObjectTransfer.getInstance()},
- * so that you can include it in when adding drag support to a viewer.
- * See {@link EditingDomainViewerDropAdapter} and {@link ViewerDragAdapter} for more details.
- * <p>
- * As an addded guard, the time is recorded and serialized in javaToNative
- * to that navive to java can ensure that it's returns the value that was really to have been transferred.
- */
-public class ObjectTransfer extends ByteArrayTransfer
-{
- /**
- * This is the register transfer type name.
- */
- protected static final String TYPE_NAME = "local-transfer-format";
-
- /**
- * This is the ID that is registered to the name.
- */
- protected static final int TYPE_ID = registerType(TYPE_NAME);
-
- /**
- * This is initialized and returned by {@link #getInstance}.
- */
- protected static ObjectTransfer instance;
-
- /**
- * This returns the one instance of this transfer agent.
- */
- public static ObjectTransfer getInstance()
- {
- if (instance == null)
- {
- instance = new ObjectTransfer();
- }
-
- return instance;
- }
-
- /**
- * This records the time at which the transfer data was recorded.
- */
- protected long startTime;
-
- /**
- * This records the data being transferred.
- */
- protected Object object;
-
- /**
- * This creates an instance; typically you get one from {@link #getInstance}.
- */
- protected ObjectTransfer()
- {
- }
-
- /**
- * This returns the transfer ids that this agent supports.
- */
- protected int[] getTypeIds()
- {
- return new int[] { TYPE_ID };
- }
-
- /**
- * This returns the transfer names that this agent supports.
- */
- public String[] getTypeNames()
- {
- return new String[] { TYPE_NAME };
- }
-
- /**
- * This records the object and current time and encodes only the current time into the transfer data.
- */
- public void javaToNative(Object object, TransferData transferData)
- {
- startTime = System.currentTimeMillis();
- this.object = object;
- if (transferData != null)
- {
- super.javaToNative(String.valueOf(startTime).getBytes(), transferData);
- }
- }
-
- /**
- * This decodes the time of the transfer and returns the recorded the object if the recorded time and the decoded time match.
- */
- public Object nativeToJava(TransferData transferData)
- {
- long startTime = Long.valueOf(new String((byte[])super.nativeToJava(transferData))).longValue();
- return
- this.startTime == startTime ?
- object :
- null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDragAdapter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDragAdapter.java
deleted file mode 100644
index d3aa343..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDragAdapter.java
+++ /dev/null
@@ -1,86 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-
-
-/**
- * This is an implemention of {@link DragSourceListener}.
- * It allows the selection in effect at the start of the drag and drop interaction to be recorded,
- * which is especially important for a drag and drop interaction within a single view.
- * This is how one of these adapters is typically hooked up:
- * <pre>
- * viewer.addDragSupport
- * (DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK,
- * new Transfer [] { LocalTransfer.getInstance() },
- * ViewerDragAdapter(viewer));
- * </pre>
- * Doing so simply allows a drag operation to be initiated from the viewer
- * such that the viewer's selection is transferred to the drop target.
- * See {@link EditingDomainViewerDropAdapter} and {@link LocalTransfer} for more details.
- */
-public class ViewerDragAdapter implements DragSourceListener
-{
- /**
- * This keeps track of the viewer to which we are listening.
- */
- protected Viewer viewer;
-
- /**
- * This keeps track of the selection that is in effect at the start of the drag operation
- */
- protected ISelection selection;
-
- /**
- * This creates an instance for the given viewer.
- */
- public ViewerDragAdapter(Viewer viewer)
- {
- super();
-
- // Remember the viewer and listen to SWT.DragDetect to alert the start of the drag operation.
- //
- this.viewer = viewer;
- }
-
- /**
- * This is called when dragging is initiated; it records the {@link #selection} of {@link #viewer}.
- */
- public void dragStart(DragSourceEvent event)
- {
- selection = viewer.getSelection();
- }
-
- /**
- * This is called when dragging is completed; it forgets the {@link #selection}.
- */
- public void dragFinished(DragSourceEvent event)
- {
- selection = null;
- }
-
- /**
- * This is called to transfer the data.
- */
- public void dragSetData(DragSourceEvent event)
- {
- if (ObjectTransfer.getInstance().isSupportedType(event.dataType))
- {
- event.data = selection;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDropAdapter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDropAdapter.java
deleted file mode 100644
index 3bd03f2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dnd/ViewerDropAdapter.java
+++ /dev/null
@@ -1,768 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dnd;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.custom.TableTreeItem;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetAdapter;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-
-
-/**
- * This implementation of a drop target listener
- * is designed to turn a drag and drop operation into a {@link Command} based on the model objects of an {@link EditingDomain}
- * and created by {@link DragAndDropManager#create}.
- * It is designed to do early data transfer so the the enablement and feedback of the drag and drop interaction
- * can intimately depend on the state of the model objects involed.
- * <p>
- * The base implementation of this class should be sufficient for most applications.
- * Any change in behaviour is typically accomplished by overriding
- * {@link ItemProviderAdapter}.createDragAndDropCommand
- * to return a derived implementation of {@link DragAndDropCommand}.
- * This is how one these adapters is typically hooked up:
- * <pre>
- * viewer.addDropSupport
- * (DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK,
- * new Transfer [] { ObjectTransfer.getInstance() },
- * EditingDomainViewerDropAdapter(viewer));
- * </pre>
- * <p>
- * This implementation prefers to use a {@link ObjectTransfer},
- * which short-circuits the transfer process for simple transfers within the workbench,
- * the method {@link #getDragSource} can be overriden to change the behaviour.
- * The implementation also only handles an {@link IStructuredSelection},
- * but the method {@link #extractDragSource} can be overriden to change the behaviour.
- * <p>
- * You can call {@link #setHoverThreshold} to set the amount of time, in milliseconds,
- * to hover over an item before {@link #hover} is called;
- * the default is 1500 milliseconds.
- */
-public class ViewerDropAdapter extends DropTargetAdapter
-{
- /**
- * This is the viewer for which this is a drop target listener.
- */
- protected Viewer viewer;
-
- /**
- * This is the collection of source objects being dragged.
- */
- protected Collection source;
-
- /**
- * This is the command created during dragging which provides the feedback and will carry out the action upon completion.
- */
- // protected Command command;
- protected DragAndDropCommand command;
-
- /**
- * This records the object for which the {@link #command} was created.
- */
- protected Object commandTarget;
-
- /**
- * The amount of time to hover over a tree item before expanding it
- */
- protected int hoverThreshold = 1500;
-
- /**
- * The is the time the mouse first started hovering over the current item.
- */
- protected long hoverStart = 0;
-
- /**
- * This keeps track of the most recent item for the {@link #hoverStart}.
- */
- protected Widget previousItem;
-
- /**
- * This keeps track of the original operation that was in effect before we set the event.detail in here.
- */
- protected int originalOperation;
-
- /**
- * This keeps track of the information used to create the current command.
- */
- protected DragAndDropCommandInformation dragAndDropCommandInformation;
-
- protected DragAndDropManager dragAndDropManager;
-
- /**
- * This creates and instance of the given domain and viewer.
- */
- public ViewerDropAdapter(Viewer viewer, DragAndDropManager dragAndDropManager)
- {
- this.viewer = viewer;
- this.dragAndDropManager = dragAndDropManager;
- }
-
- /**
- * This is called when the mouse first enters or starts dragging in the viewer.
- */
- public void dragEnter(DropTargetEvent event)
- {
- originalOperation = event.detail;
- helper(event);
- }
-
- /**
- * This is called when the mouse leaves or stops dragging in the viewer
- */
- public void dragLeave(DropTargetEvent event)
- {
- // Clean up the command if there is one.
- //
- if (command != null)
- {
-// command.dispose();
- command = null;
- commandTarget = null;
- }
-
- // Reset the other values.
- //
- previousItem = null;
- hoverStart = 0;
- source = null;
- }
-
- /**
- * This is called when the operation has changed in some way, typically because the user changes keyboard modifiers.
- */
- public void dragOperationChanged(DropTargetEvent event)
- {
- originalOperation = event.detail;
- helper(event);
- }
-
- /**
- * This is called repeated when the mouse over the viewer.
- */
- public void dragOver(DropTargetEvent event)
- {
- helper(event);
- }
-
- /**
- * This is called just as the mouse is released over the viewer to initiate a drop.
- */
- public void dropAccept(DropTargetEvent event)
- {
- // There seems to be a bug in SWT that the view may have scrolled.
- // helper(event);
- }
-
- /**
- * This is called to indate that the drop action should be invoked.
- */
- public void drop(DropTargetEvent event)
- {
- // There seems to be a bug in SWT that the view may have scrolled.
- // helper(event);
- if (dragAndDropCommandInformation != null)
- {
- command = dragAndDropCommandInformation.createCommand();
-
- // Execute the command
- command.execute();
-
- // Clean up the state.
- //
- command = null;
- commandTarget = null;
- previousItem = null;
- hoverStart = 0;
- source = null;
- }
- }
-
- /**
- * This method is called the same way for each of the {@link org.eclipse.swt.dnd.DropTargetListener} methods, except during leave.
- */
- protected void helper(DropTargetEvent event)
- {
- // Try to get the source if there isn't one.
- //
- if (source == null)
- {
- source = getDragSource(event);
- }
- else if (event.currentDataType == null)
- {
- setCurrentDataType(event);
- }
-
- // If there's still no source, wait until the next time to try again.
- //
- if (source == null)
- {
- event.detail = DND.DROP_NONE;
- event.feedback = DND.FEEDBACK_SELECT;
- }
- // Otherwise, if we need to scroll...
- //
- else if (scrollIfNeeded(event))
- {
- // In the case that we scroll, we just do all the work on the next event and only just scroll now.
- //
- event.feedback = DND.FEEDBACK_SELECT;
- }
- else
- {
- // Get the data from the item, if there is one.
- //
- Object target = event.item == null ? null : event.item.getData();
- if (target instanceof TableTreeItem)
- {
- target = ((TableTreeItem)target).getData();
- }
-
- // Do the logic to determine the hover information.
- // If we're over a new item from before.
- //
- if (event.item != previousItem)
- {
- // Remember the item and the time.
- //
- previousItem = event.item;
- hoverStart = event.time;
- }
- else if (target != null)
- {
- if (event.time - hoverStart > hoverThreshold)
- {
- hover(target);
-
- // We don't need to hover over this guy again.
- //
- hoverStart = Integer.MAX_VALUE;
- }
- }
-
- // Determine if we can create a valid command at the current mouse location.
- //
- boolean valid = false;
-
- // If we don't have a previous cached command...
- //
- if (command == null)
- {
- // Create the command and test if it is executable.
- //
- commandTarget = target;
- command = dragAndDropManager.createCommand(target, getLocation(event), event.operations, event.detail, source);
- if (command != null)
- {
- valid = command.canExecute();
- }
- }
- else
- {
- int operation = originalOperation != event.detail ? originalOperation : event.detail;
-
- // Check if the cached command is able to provide drag and drop feedback.
- //
- if (target == commandTarget)// && command instanceof DragAndDropFeedback)
- {
- float location = getLocation(event);
-
- dragAndDropCommandInformation =
- new DragAndDropCommandInformation(target, location, event.operations, operation, source);
-
- // If so, revalidate the command.
- //
- command.reinitialize(target, location, event.operations, operation, source);
- if (command != null)
- {
- valid = command.canExecute();
- }
- }
- else
- {
- // If not, dispose the current command and create a new one.
- //
- // command.dispose();
- commandTarget = target;
-
- dragAndDropCommandInformation =
- new DragAndDropCommandInformation(target, getLocation(event), event.operations, operation, source);
-
- // DragAndDropManager.create(domain, target, getLocation(event), event.operations, operation, source);
- //
- command = dragAndDropCommandInformation.createCommand();
-
- if (command != null)
- {
- valid = command.canExecute();
- }
- }
- }
-
- // If this command can provide detailed drag and drop feedback...
- //
- //if (command instanceof DragAndDropCommand)
- if (command != null)
- {
- // Use the feedback for the operation and mouse point from the command.
- //
- event.detail = command.getOperation();
- event.feedback = command.getFeedback();
- }
- else if (valid)
- {
- // All we can know is to provide selection feedback.
- //
- event.feedback = DND.FEEDBACK_SELECT;
- }
- else
- {
- // There is no executable command, so we'd better nix the whole deal.
- //
- event.detail = DND.DROP_NONE;
- event.feedback = DND.FEEDBACK_SELECT;
- }
- }
- }
-
-
- protected void setCurrentDataType(DropTargetEvent event)
- {
- ObjectTransfer objectTransfer = ObjectTransfer.getInstance();
- TransferData [] dataTypes = event.dataTypes;
- for (int i = 0; i < dataTypes.length; ++i)
- {
- TransferData transferData = dataTypes[i];
- // If the local tansfer supports this datatype, switch to that data type
- //
- if (objectTransfer.isSupportedType(transferData))
- {
- event.currentDataType = transferData;
- }
- }
- }
-
- /**
- * This attempts to extract the drag source from the event early, i.e., before the drop method.
- * This implementation tries to use a {@link org.eclipse.wst.common.ui.internal.dnd.ObjectTransfer}.
- */
- protected Collection getDragSource(DropTargetEvent event)
- {
- // Check whether the current data type can be transfered locally.
- //
- ObjectTransfer objectTransfer = ObjectTransfer.getInstance();
- if (!objectTransfer.isSupportedType(event.currentDataType))
- {
- // Iterate over the data types to see if there is a datatype that supports a local transfer.
- //
- setCurrentDataType(event);
- return null;
- }
- else
- {
- // Transfer the data and extract it.
- //
- Object object = objectTransfer.nativeToJava(event.currentDataType);
- if (object == null)
- {
- return null;
- }
- else
- {
- return extractDragSource(object);
- }
- }
- }
-
- /**
- * This extracts a collection of dragged source objects from the given object retrieved from the transfer agent.
- * This default implementation converts a structured selection into a collection of elements.
- */
- protected Collection extractDragSource(Object object)
- {
- // Transfer the data and convert the structured selection to a collection of objects.
- //
- if (object instanceof IStructuredSelection)
- {
- Collection result = new ArrayList();
- for (Iterator elements = ((IStructuredSelection)object).iterator(); elements.hasNext(); )
- {
- result.add(elements.next());
- }
- return result;
- }
- else
- {
- return Collections.EMPTY_LIST;
- }
- }
-
- /**
- * This gets the amount of time, in milliseconds, to hover over an item before {@link #hover} is called.
- */
- public int getHoverThreshold()
- {
- return hoverThreshold;
- }
-
- /**
- * This set the amount of time, in milliseconds, to hover over an item before {@link #hover} is called.
- */
- public void setHoverThreshold(int hoverThreshold)
- {
- this.hoverThreshold = hoverThreshold;
- }
-
- /**
- * This is called when the cursor has hovered over the given target for longer than {@link #hoverThreshold}.
- */
- protected void hover(Object target)
- {
- if (viewer instanceof AbstractTreeViewer)
- {
- ((AbstractTreeViewer)viewer).expandToLevel(target, 1);
- }
- }
-
- /**
- * This returns whether a scroll was performed based on the given drag coordinates.
- */
- protected boolean scrollIfNeeded(DropTargetEvent event)
- {
- // By default we'll not scroll
- //
- boolean result = false;
-
- // We only handle a tree item right now.
- //
- if (event.item instanceof TreeItem)
- {
- // Tree items have special data that will help.
- //
- TreeItem treeItem = (TreeItem)event.item;
-
- // We need need the point in the coordinates of the control and the control's bounds.
- //
- Tree tree = treeItem.getParent();
- Point point = tree.toControl(new Point(event.x, event.y));
- Rectangle bounds = tree.getClientArea();
-
- // This is the distance in pixels from the top or bottom that will cause scrolling.
- //
- int scrollEpsilon = Math.min(treeItem.getBounds().height, bounds.height / 3);
-
- // This will be the item that should be scrolled into the view.
- //
- TreeItem scrollTreeItem = null;
-
- // If we should scroll up.
- //
- if (point.y < scrollEpsilon)
- {
- // Determine the parent to find the sibling.
- //
- TreeItem parent = treeItem.getParentItem();
- // Walk through the siblings.
- //
- TreeItem [] children = parent == null ? tree.getItems() : parent.getItems();
- for (int i = 0; i < children.length; ++i)
- {
- // Is this a match.
- //
- if (children[i] == treeItem)
- {
- // If there is a previous sibling...
- //
- if (i > 0)
- {
- scrollTreeItem = children[i - 1];
-
- // Get the last deepest descendent of this previous sibling.
- //
- for (;;)
- {
- children = scrollTreeItem.getItems();
- if (children != null && children.length != 0 && scrollTreeItem.getExpanded())
- {
- scrollTreeItem = children[children.length - 1];
- }
- else
- {
- break;
- }
- }
- }
- else
- {
- // The parent must be the previous.
- //
- scrollTreeItem = parent;
- }
-
- // We're done after the match.
- //
- break;
- }
- }
- }
- // If we should scroll down...
- //
- else if (bounds.height - point.y < scrollEpsilon)
- {
- // If this thing has visible children, then the first child must be next.
- //
- TreeItem [] children = treeItem.getItems();
- if (children != null && children.length != 0 && treeItem.getExpanded())
- {
- scrollTreeItem = children[0];
- }
- else
- {
- // We need the parent to determine siblings and will walk up the tree if we are the last sibling.
- //
- while (scrollTreeItem == null)
- {
- // If there's no parent, we're done.
- //
- TreeItem parent = treeItem.getParentItem();
- // Walk the children.
- //
- children = parent == null ? tree.getItems() : parent.getItems();
- for (int i = 0; i < children.length; ++i)
- {
- // When we find the child.
- //
- if (children[i] == treeItem)
- {
- // If the next index is a valid index...
- //
- if (++i < children.length)
- {
- // We've found the item.
- //
- scrollTreeItem = children[i];
- }
-
- // We're done with this parent.
- //
- break;
- }
- }
-
- if (parent == null)
- {
- break;
- }
-
- // Walk up.
- //
- treeItem = parent;
- }
- }
- }
-
- // If we should scroll.
- //
- if (scrollTreeItem != null)
- {
- // Only scroll if we're on an item for a while.
- //
- if (previousItem != null && event.time - hoverStart > 200)
- {
- ScrollBar verticalScrollBar = tree.getVerticalBar();
- if (verticalScrollBar != null)
- {
- int before = verticalScrollBar.getSelection();
-
- // Make sure the item is scrolled in place.
- //
- tree.showItem(scrollTreeItem);
-
- // Make sure we don't scroll again quickly.
- //
- previousItem = null;
-
- // Indicate that we've done a scroll and nothing else should be done.
- //
- result = before != verticalScrollBar.getSelection();
- }
- }
- else
- {
- // If the item changes, reset the timer information.
- //
- if (event.item != previousItem)
- {
- previousItem = event.item;
- hoverStart = event.time;
- }
- }
- }
- }
- else if (event.item instanceof TableItem)
- {
- // Table items have special data that will help.
- //
- TableItem tableItem = (TableItem)event.item;
-
- // We need need the point in the coordinates of the control and the control's bounds.
- //
- Table table = tableItem.getParent();
- Point point = table.toControl(new Point(event.x, event.y));
- Rectangle bounds = table.getClientArea();
- if (table.getHeaderVisible())
- {
- int offset = table.getItemHeight();
- bounds.y += offset;
- bounds.height -= offset;
- point.y -= offset;
- }
-
- // The position of this item.
- //
- int index = table.indexOf(tableItem);
-
- // This is the distance in pixels from the top or bottom that will cause scrolling.
- //
- int scrollEpsilon = Math.min(tableItem.getBounds(0).height, bounds.height / 3);
-
- // This will be the item that should be scrolled into the view.
- //
- TableItem scrollTableItem = null;
-
- // If we should scroll up.
- //
- if (point.y < scrollEpsilon)
- {
- if (index > 0)
- {
- scrollTableItem = table.getItems()[index - 1];
- }
- }
- // If we should scroll down...
- //
- else if (bounds.height - point.y < scrollEpsilon)
- {
- if (index + 1 < table.getItems().length)
- {
- scrollTableItem = table.getItems()[index + 1];
- }
- }
-
- // If we should scroll.
- //
- if (scrollTableItem != null)
- {
- // Only scroll if we're on an item for a while.
- //
- if (previousItem != null && event.time - hoverStart > 200)
- {
- ScrollBar verticalScrollBar = table.getVerticalBar();
- if (verticalScrollBar != null)
- {
- int before = verticalScrollBar.getSelection();
-
- // Make sure the item is scrolled in place.
- //
- table.showItem(scrollTableItem);
-
- // Make sure we don't scroll again quickly.
- //
- previousItem = null;
-
- // Indicate that we've done a scroll and nothing else should be done.
- //
- result = before != verticalScrollBar.getSelection();
- }
- }
- else
- {
- // If the item changes, reset the timer information.
- //
- if (event.item != previousItem)
- {
- previousItem = event.item;
- hoverStart = event.time;
- }
- }
- }
- }
-
- return result;
- }
-
- protected static float getLocation(DropTargetEvent event)
- {
- if (event.item instanceof TreeItem)
- {
- TreeItem treeItem = (TreeItem)event.item;
- Control control = treeItem.getParent();
- Point point = control.toControl(new Point(event.x, event.y));
- Rectangle bounds = treeItem.getBounds();
- return (float)(point.y - bounds.y) / (float)bounds.height;
- }
- else if (event.item instanceof TableItem)
- {
- TableItem tableItem = (TableItem)event.item;
- Control control = tableItem.getParent();
- Point point = control.toControl(new Point(event.x, event.y));
- Rectangle bounds = tableItem.getBounds(0);
- return (float)(point.y - bounds.y) / (float)bounds.height;
- }
- else
- {
- return 0.0F;
- }
- }
-
- protected class DragAndDropCommandInformation
- {
- // protected EditingDomain domain;
- protected Object target;
- protected float location;
- protected int operations;
- protected int operation;
- protected Collection source;
- public DragAndDropCommandInformation
- (Object target, float location, int operations, int operation, Collection source)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.source = new ArrayList(source);
- }
-
- public DragAndDropCommand createCommand()
- {
- return dragAndDropManager.createCommand(target, location, operations, operation, source);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/NavigableTableViewer.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/NavigableTableViewer.java
deleted file mode 100644
index 9f03d3b..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/NavigableTableViewer.java
+++ /dev/null
@@ -1,46 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Table;
-
-public class NavigableTableViewer extends TableViewer
-{
- TableNavigator navigator;
-
- public NavigableTableViewer(Table parent)
- {
- super(parent);
- navigator = new TableNavigator(getTable(), this);
- }
-
- //override setCellEditors to put in call to moveAboveCellEditors for TableNavigator
- public void setCellEditors(CellEditor[] editors)
- {
- super.setCellEditors(editors);
- navigator.moveCellEditorsAbove(editors);
-
- }
-
- //override refresh so that TableNavigator is refreshed for all model changes
- public void refresh()
- {
- if( !this.getTable().isDisposed() )
- {
- super.refresh();
- navigator.refresh();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/ResourceFilter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/ResourceFilter.java
deleted file mode 100644
index aaa3f5d..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/ResourceFilter.java
+++ /dev/null
@@ -1,101 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import java.util.Collection;
-
-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.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-public class ResourceFilter extends ViewerFilter
-{
- protected String[] fExtensions;
- protected IFile[] fExcludedFiles;
- protected Collection fExcludes;
-
- public ResourceFilter(String[] extensions, Collection exclude)
- {
- fExtensions= extensions;
- fExcludes= exclude;
- fExcludedFiles = null;
- }
-
- public ResourceFilter(String[] extensions, IFile[] excludedFiles, Collection exclude)
- {
- fExtensions= extensions;
- fExcludes= exclude;
- fExcludedFiles = excludedFiles;
- }
-
- public boolean isFilterProperty(Object element, Object property)
- {
- return false;
- }
-
- public boolean select(Viewer viewer, Object parent, Object element)
- {
- if (element instanceof IFile)
- {
- if (fExcludes != null && fExcludes.contains(element))
- {
- return false;
- }
- String name= ((IFile)element).getName();
- if (fExcludedFiles != null)
- {
- for (int j= 0; j < fExcludedFiles.length; j++)
- {
- if ( ((IFile)element).getLocation().
- toOSString().compareTo((fExcludedFiles[j]).getLocation().toOSString()) == 0 )
- return false;
- }
- }
- if (fExtensions.length == 0)
- {
- // assume that we don't want to filter any files based on
- // extension
- return true;
- }
- for (int i= 0; i < fExtensions.length; i++)
- {
- if (name.endsWith(fExtensions[i]))
- {
- return true;
- }
- }
- return false;
- }
- else if (element instanceof IContainer)
- { // IProject, IFolder
- try
- {
- IResource[] resources= ((IContainer)element).members();
- for (int i= 0; i < resources.length; i++)
- {
- // recursive!
- if (select(viewer, parent, resources[i]))
- {
- return true;
- }
- }
- }
- catch (CoreException e)
- {
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectMultiFilePage.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectMultiFilePage.java
deleted file mode 100644
index d8a9083..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectMultiFilePage.java
+++ /dev/null
@@ -1,388 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import java.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.core.resources.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.ui.wizards.datatransfer.*;
-import org.eclipse.wst.common.ui.internal.Messages;
-
-
-// Page to specify the source files
-public class SelectMultiFilePage extends WizardPage {
- IWorkbench workbench;
- IStructuredSelection selection;
- boolean isFileMandatory;
- TreeViewer sourceFileViewer;
- Button addButton;
- Button removeButton;
- Button removeAllButton;
- org.eclipse.swt.widgets.List selectedListBox;
- Button importButton;
- private Vector fFilters;
- protected IFile[] fileNames;
- IWorkspaceRoot workspaceRoot;
-
- private final static int SIZING_LISTS_HEIGHT = 200;
- private final static int SIZING_LISTS_WIDTH = 150;
-
- // parameter isFileMandatory is used to determine if at least one file must be selected
- // before being able to proceed to the next page
- public SelectMultiFilePage(
- IWorkbench workbench,
- IStructuredSelection selection,
- boolean isFileMandatory) {
- super("SelectMultiFilePage");
- this.workbench = workbench;
- this.selection = selection;
- this.isFileMandatory = isFileMandatory;
- this.workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- this.fileNames = null;
- }
-
- public void createControl(Composite parent) {
-
- Composite pageContent = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- pageContent.setLayout(layout);
- pageContent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // variable never used ... is pageContent.getLayoutData() needed?
- //GridData outerFrameGridData = (GridData)
- pageContent.getLayoutData();
-
- // outerFrameGridData.horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
- // outerFrameGridData.verticalAlignment = GridData.VERTICAL_ALIGN_FILL;
-
- // WorkbenchHelp.setHelp(
- // pageContent,
- // B2BGUIContextIds.BTBG_SELECT_MULTI_FILE_PAGE);
-
- createLabels(pageContent);
- createSourceViewer(pageContent);
- createButtonPanel(pageContent);
- createSelectedListBox(pageContent);
- createImportButton(pageContent);
-
- setControl(pageContent);
- if (isFileMandatory)
- setPageComplete(false);
-
- }
-
- public IFile[] getFiles() {
- return fileNames;
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions) {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions =
- new String[filterExtensions.length];
- for (int i = 0; i < filterExtensions.length; i++) {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- correctedFilterExtensions[i] = filterExtensions[i];
- else
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
-
- ViewerFilter filter =
- new ResourceFilter(correctedFilterExtensions, null);
- addFilter(filter);
- }
-
- public boolean isValidSourceFileViewerSelection(ISelection selection) {
- return true;
- }
-
- public void setVisible(boolean visible) {
- if (visible == true) {
- if (fFilters != null) {
- sourceFileViewer.resetFilters();
- for (Iterator i = fFilters.iterator(); i.hasNext();)
- sourceFileViewer.addFilter((ViewerFilter) i.next());
- }
- sourceFileViewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
- }
- super.setVisible(visible);
- }
-
- public void setFiles(String[] fileNames) {
- int size = Arrays.asList(fileNames).size();
- Vector iFileNames = new Vector();
- for (int i = 0; i < size; i++) {
- IResource resource = workspaceRoot.findMember(fileNames[i]);
- if (resource instanceof IFile)
- iFileNames.addElement(resource);
- }
- IFile[] dummyArray = new IFile[iFileNames.size()];
- this.fileNames = (IFile[]) (iFileNames.toArray(dummyArray));
- }
-
- public void resetFilters() {
- fFilters = null;
- }
-
- public void addFilter(ViewerFilter filter) {
- if (fFilters == null)
- fFilters = new Vector();
- fFilters.add(filter);
- }
-
- public void setAddButtonEnabled(boolean isEnabled) {
- addButton.setEnabled(isEnabled);
- }
-
- public void setRemoveButtonEnabled(boolean isEnabled) {
- removeButton.setEnabled(isEnabled);
- }
-
- private void createLabels(Composite pageContent) {
- Label label = new Label(pageContent, SWT.LEFT);
- label.setText(Messages._UI_LABEL_SOURCE_FILES);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- label = new Label(pageContent, SWT.LEFT);
- label.setText(Messages._UI_LABEL_SELECTED_FILES);
- }
-
- public boolean checkIfFileInTarget(IFile fileToCheck) {
- String[] strings = selectedListBox.getItems();
- int size = selectedListBox.getItemCount();
- for (int i = 0; i < size; i++) {
- if (strings[i].compareTo(fileToCheck.getFullPath().toString())
- == 0)
- return true;
- }
- return false;
- }
-
- private void createSourceViewer(Composite parent) {
- sourceFileViewer =
- new TreeViewer(
- new Tree(
- parent,
- SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER));
- sourceFileViewer.setContentProvider(new WorkbenchContentProvider());
- sourceFileViewer.setLabelProvider(new WorkbenchLabelProvider());
- sourceFileViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- java.util.List list;
- ISelection selection = event.getSelection();
- boolean newFilesSelected = false;
-
- if (selection instanceof IStructuredSelection) {
- list = ((IStructuredSelection) selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();) {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile) {
- if (checkIfFileInTarget((IFile) resource) == false)
- newFilesSelected = true;
- }
- }
- setAddButtonEnabled(newFilesSelected);
- }
- }
- });
- sourceFileViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- addSelectedFilesToTargetList();
- }
- });
-
- Control treeWidget = sourceFileViewer.getTree();
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = SIZING_LISTS_WIDTH;
- gd.heightHint = SIZING_LISTS_HEIGHT;
- treeWidget.setLayoutData(gd);
- }
-
- private void createButtonPanel(Composite pageContent) {
- Composite buttonPanel = new Composite(pageContent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- buttonPanel.setLayout(layout);
-
- GridData gridData = new GridData();
- gridData.grabExcessHorizontalSpace = false;
- gridData.grabExcessVerticalSpace = true;
- gridData.verticalAlignment = GridData.CENTER;
- gridData.horizontalAlignment = GridData.CENTER;
- buttonPanel.setLayoutData(gridData);
-
- addButton = new Button(buttonPanel, SWT.PUSH);
- addButton.setText(Messages._UI_ADD_BUTTON);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- addButton.setLayoutData(gridData);
- addButton.addSelectionListener(new ButtonSelectListener());
- addButton.setToolTipText(Messages._UI_ADD_BUTTON_TOOL_TIP);
- addButton.setEnabled(false);
-
- removeButton = new Button(buttonPanel, SWT.PUSH);
- removeButton.setText(Messages._UI_REMOVE_BUTTON);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- removeButton.setLayoutData(gridData);
- removeButton.addSelectionListener(new ButtonSelectListener());
- removeButton.setToolTipText(Messages._UI_REMOVE_BUTTON_TOOL_TIP);
- removeButton.setEnabled(false);
-
- removeAllButton = new Button(buttonPanel, SWT.PUSH);
- removeAllButton.setText(Messages._UI_REMOVE_ALL_BUTTON);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- removeAllButton.setLayoutData(gridData);
- removeAllButton.addSelectionListener(new ButtonSelectListener());
- removeAllButton.setToolTipText(Messages._UI_REMOVE_ALL_BUTTON_TOOL_TIP);
- removeAllButton.setEnabled(false);
- }
-
- private void createSelectedListBox(Composite parent) {
- selectedListBox = new List(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- selectedListBox.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent event) {
- }
-
- public void widgetSelected(SelectionEvent event) {
-
- if (selectedListBox.getSelectionCount() > 0)
- setRemoveButtonEnabled(true);
- else
- setRemoveButtonEnabled(false);
- return;
- }
- });
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = SIZING_LISTS_WIDTH;
- gd.heightHint = SIZING_LISTS_HEIGHT;
- selectedListBox.setLayoutData(gd);
- }
-
- void createImportButton(Composite parent) {
- importButton = new Button(parent, SWT.PUSH);
- importButton.setText(Messages._UI_IMPORT_BUTTON);
-
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- importButton.setLayoutData(gridData);
- importButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- FileSystemImportWizard importWizard =
- new FileSystemImportWizard();
- importWizard.init(workbench, selection);
- Shell shell = Display.getCurrent().getActiveShell();
- WizardDialog wizardDialog =
- new WizardDialog(shell, importWizard);
- wizardDialog.create();
- wizardDialog.open();
- sourceFileViewer.refresh();
- }
- });
- importButton.setToolTipText(Messages._UI_IMPORT_BUTTON_TOOL_TIP);
- }
-
- public void addSelectedFilesToTargetList() {
- ISelection selection = sourceFileViewer.getSelection();
-
- if (isValidSourceFileViewerSelection(selection)) {
- java.util.List list = null;
- if (selection instanceof IStructuredSelection) {
- list = ((IStructuredSelection) selection).toList();
-
- if (list != null) {
- list = ((IStructuredSelection) selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();) {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile) {
- // Check if its in the list. Don't add it if it is.
- String resourceName =
- resource.getFullPath().toString();
- if (selectedListBox.indexOf(resourceName) == -1)
- selectedListBox.add(resourceName);
- }
- }
- setFiles(selectedListBox.getItems());
- }
-
- setAddButtonEnabled(false);
-
- if (selectedListBox.getItemCount() > 0) {
- removeAllButton.setEnabled(true);
- if (isFileMandatory)
- setPageComplete(true);
- if (selectedListBox.getSelectionCount() > 0)
- setRemoveButtonEnabled(true);
- else
- setRemoveButtonEnabled(false);
- }
- }
- }
- }
-
- class ButtonSelectListener implements SelectionListener {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == addButton) {
- addSelectedFilesToTargetList();
- } else if (e.widget == removeButton) {
- String[] strings = selectedListBox.getSelection();
- int size = selectedListBox.getSelectionCount();
- for (int i = 0; i < size; i++) {
- selectedListBox.remove(strings[i]);
- }
- removeButton.setEnabled(false);
- if (selectedListBox.getItemCount() == 0) {
- removeAllButton.setEnabled(false);
- if (isFileMandatory)
- setPageComplete(false);
- }
- setFiles(selectedListBox.getItems());
- } else if (e.widget == removeAllButton) {
- selectedListBox.removeAll();
- removeButton.setEnabled(false);
- removeAllButton.setEnabled(false);
- if (isFileMandatory)
- setPageComplete(false);
- setFiles(selectedListBox.getItems());
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFilePage.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFilePage.java
deleted file mode 100644
index 78af295..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFilePage.java
+++ /dev/null
@@ -1,95 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-//import org.eclipse.ui.help.WorkbenchHelp;
-
-public class SelectSingleFilePage extends WizardPage
-{
- protected IWorkbench workbench;
- protected SelectSingleFileView selectSingleFileView;
-
- // parameter isFileMandatory is used to determine if a file must be selected
- // before being able to proceed to the next page
- public SelectSingleFilePage(IWorkbench workbench, IStructuredSelection selection, boolean isFileMandatory)
- {
- super("SelectSingleFilePage");
- this.workbench = workbench;
- selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory);
- }
-
- public void setVisible(boolean visible)
- {
- selectSingleFileView.setVisibleHelper(visible);
- super.setVisible(visible);
- }
-
- public void createControl(Composite parent)
- {
- SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener()
- {
- public void setControlComplete(boolean isComplete)
- {
- setPageComplete(isComplete);
- }
- };
- selectSingleFileView.setListener(listener);
- Control control = selectSingleFileView.createControl(parent);
-// WorkbenchHelp.setHelp(control, B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_PAGE);
- setControl(control);
- }
-
- public void addFilter(ViewerFilter filter)
- {
- selectSingleFileView.addFilter(filter);
- }
-
- public void addFilterExtensions(String[] filterExtensions)
- {
- selectSingleFileView.addFilterExtensions(filterExtensions);
- }
-
- public void resetFilters()
- {
- selectSingleFileView.resetFilters();
- }
-
- public IFile getFile()
- {
- return selectSingleFileView.getFile();
- }
-
-
- /**
- * Returns the selectSingleFileView.
- * @return SelectSingleFileView
- */
- public TreeViewer getSourceFileViewer() {
- return selectSingleFileView.sourceFileViewer;
- }
-
- /**
- * Returns the selectSingleFileView.
- * @return SelectSingleFileView
- */
- public SelectSingleFileView getSelectSingleFileView() {
- return selectSingleFileView;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java
deleted file mode 100644
index 70533c7..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java
+++ /dev/null
@@ -1,450 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.wizards.datatransfer.FileSystemImportWizard;
-import org.eclipse.wst.common.ui.internal.Messages;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-
-
-
-public class SelectSingleFileView
-{
- protected Composite composite;
- protected IStructuredSelection selection;
- protected boolean isFileMandatory;
- protected TreeViewer sourceFileViewer;
- protected Button importButton;
- protected Vector fFilters;
- protected IFile selectedFile;
- protected ISelection defaultSelection;
- protected Listener listener;
-
- public static interface Listener
- {
- public void setControlComplete(boolean isComplete);
- }
-
- public SelectSingleFileView(IStructuredSelection selection, boolean isFileMandatory)
- {
- this.selection = selection;
- this.isFileMandatory = isFileMandatory;
- this.selectedFile= null;
- this.defaultSelection = null;
- }
-
- public Composite createControl(Composite parent)
- {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite smallComposite = new Composite(composite, SWT.NONE);
- smallComposite.setLayoutData(new GridData(GridData.FILL, GridData.HORIZONTAL_ALIGN_FILL, true, false));
- GridLayout gridLayout = new GridLayout(2, false);
- gridLayout.marginHeight = 0;
- smallComposite.setLayout(gridLayout);
-
- Label label = new Label(smallComposite, SWT.NONE);
- label.setText(Messages._UI_LABEL_SOURCE_FILES);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING, GridData.END, false, false));
-
- //Collapse and Expand all buttons
- ToolBar toolBar = new ToolBar(smallComposite, SWT.FLAT);
- toolBar.setLayoutData(new GridData(GridData.END, GridData.END, true, false));
-
- ToolItem toolItem = new ToolItem(toolBar, SWT.NONE);
- ImageDescriptor imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/expandAll.gif");
- Image image = imageDescriptor.createImage();
- toolItem.setImage(image);
- toolItem.setToolTipText(Messages._UI_POPUP_EXPAND_ALL);
- toolItem.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- sourceFileViewer.expandAll();
-
- }});
-
-
- toolItem = new ToolItem(toolBar, SWT.NONE);
- imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/collapseAll.gif");
- image = imageDescriptor.createImage();
- toolItem.setImage(image);
- toolItem.setToolTipText(Messages._UI_POPUP_COLLAPSE_ALL);
- toolItem.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- sourceFileViewer.collapseAll();
-
- }});
-
- createSourceViewer(composite);
- createFilterControl(composite);
- createImportButton(composite);
- sourceFileViewer.getTree().setFocus();
- return composite;
- }
-
-
- protected void createFilterControl(Composite composite)
- {
- }
-
-public void setListener(Listener listener)
- {
- this.listener = listener;
- }
-
- protected void createSourceViewer(Composite parent)
- {
- sourceFileViewer = new TreeViewer(new Tree(parent, SWT.SINGLE | SWT.BORDER));
- sourceFileViewer.setContentProvider(new WorkbenchContentProvider());
- sourceFileViewer.setLabelProvider(new WorkbenchLabelProvider());
- sourceFileViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- boolean isComplete = true;
- java.util.List list;
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- list = ((IStructuredSelection)selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();)
- {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile)
- {
- selectedFile = (IFile) resource;
- if (isFileMandatory)
- {
- isComplete = true;
- break;
- }
- }
- else
- {
- selectedFile = null;
- if (isFileMandatory)
- {
- isComplete = false;
- }
- }
- }
-
- if (listener != null)
- {
- listener.setControlComplete(isComplete);
- }
- }
- }
- });
- Control treeWidget = sourceFileViewer.getTree();
- GridData gd = new GridData(GridData.FILL_BOTH);
- treeWidget.setLayoutData(gd);
- }
-
-
- protected void createImportButton(Composite parent)
- {
- importButton = new Button(parent, SWT.NONE);
- importButton.setText(Messages._UI_IMPORT_BUTTON);
-
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- importButton.setLayoutData(gridData);
- importButton.addSelectionListener(new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- // This listener is if the Import Wizard adds a new few, we want
- // it to be selected when we come back from it
- ImportAddResourceListener importAddResourceListener= new ImportAddResourceListener();
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(importAddResourceListener);
-
- FileSystemImportWizard importWizard = new FileSystemImportWizard();
- IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
- selection = (IStructuredSelection) sourceFileViewer.getSelection();
- importWizard.init(workbench, selection != null ? selection : new StructuredSelection());
- Shell shell = Display.getCurrent().getActiveShell();
- WizardDialog wizardDialog = new WizardDialog(shell, importWizard);
- wizardDialog.create();
- wizardDialog.open();
- sourceFileViewer.refresh();
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(importAddResourceListener);
- IFile importedFile = importAddResourceListener.getImportedFile();
- if (importedFile != null)
- {
- StructuredSelection structuredSelection = new StructuredSelection(importedFile);
- sourceFileViewer.setSelection(structuredSelection);
- }
- }
- });
- importButton.setToolTipText(Messages._UI_IMPORT_BUTTON_TOOL_TIP);
- }
-
- public IFile getFile()
- {
- return selectedFile;
- }
-
- public void setDefaultSelection(ISelection selection)
- {
- this.defaultSelection = selection;
- }
-
- public void resetFilters()
- {
- fFilters=null;
- }
-
- public void addFilter(ViewerFilter filter)
- {
- if (fFilters == null)
- {
- fFilters= new Vector();
- }
- fFilters.add(filter);
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
-
- ViewerFilter filter = new ResourceFilter(correctedFilterExtensions, null);
- addFilter(filter);
- }
-
-// This is a convenience method that allows filtering of the given file
-// exensions. It internally creates a ResourceFilter so that users of this
-// class don't have to construct one.
-// If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions, IFile [] excludedFiles)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
- ViewerFilter filter;
- if (excludedFiles != null)
- {
- filter = new ResourceFilter(correctedFilterExtensions, excludedFiles, null);
- }
- else
- {
- filter = new ResourceFilter(correctedFilterExtensions, null);
- }
- addFilter(filter);
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void setFilterExtensions(String[] filterExtensions)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
- ViewerFilter filter = new ResourceFilter(correctedFilterExtensions, null);
- fFilters= new Vector();
- fFilters.add(filter);
- if (sourceFileViewer != null)
- {
- sourceFileViewer.getTree().setRedraw(false);
- sourceFileViewer.resetFilters();
- for (Iterator i=fFilters.iterator(); i.hasNext();)
- {
- sourceFileViewer.addFilter((ViewerFilter)i.next());
- }
- sourceFileViewer.getTree().setRedraw(true);
- sourceFileViewer.getTree().redraw();
- }
- }
-
- // this method should be called by a Wizard page or Dialog when it becomes visible
- public void setVisibleHelper(boolean visible)
- {
- if (visible == true)
- {
- if (fFilters != null)
- {
- sourceFileViewer.resetFilters();
- for (Iterator i=fFilters.iterator(); i.hasNext();)
- sourceFileViewer.addFilter((ViewerFilter)i.next());
- }
- sourceFileViewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
- sourceFileViewer.expandToLevel(1);
-
- if (defaultSelection != null)
- {
- sourceFileViewer.setSelection(defaultSelection, true);
- }
- else if (!sourceFileViewer.getSelection().isEmpty())
- {
- sourceFileViewer.setSelection(sourceFileViewer.getSelection());
- }
- else
- {
- if (isFileMandatory && listener != null)
- {
- listener.setControlComplete(false);
- }
- }
- }
- }
-
- class ImportAddResourceListener implements IResourceChangeListener, IResourceDeltaVisitor
- {
- Vector importedFiles;
-
- ImportAddResourceListener()
- {
- importedFiles = new Vector();
- }
-
- public void resourceChanged(IResourceChangeEvent event)
- {
- IResourceDelta resourceDelta = event.getDelta();
-
- try
- {
- if (resourceDelta != null)
- {
- resourceDelta.accept(this);
- }
- }
- catch (Exception e)
- {
- //TODO... log exception
- //UIPlugin.getMsgLogger().write("Exception caught during resource change" + e);
- //UIPlugin.getMsgLogger().writeCurrentThread();
- }
- }
-
- public boolean visit(IResourceDelta delta)
- {
- if (delta.getKind() == IResourceDelta.ADDED)
- {
- if (delta.getResource() instanceof IFile)
- importedFiles.add(delta.getResource());
- }
- return true;
- }
-
- public Collection getImportedFiles()
- {
- return importedFiles;
- }
-
- // This returns the first imported file in the list of imported files
- public IFile getImportedFile()
- {
- if (importedFiles.isEmpty() == false)
- return (IFile)importedFiles.firstElement();
-
- return null;
- }
- }
-
- public void addSelectionChangedTreeListener(ISelectionChangedListener treeListener) {
- sourceFileViewer.addSelectionChangedListener(treeListener);
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java
deleted file mode 100644
index 1d037a0..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java
+++ /dev/null
@@ -1,407 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.viewers;
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.swt.custom.TableCursor;
-import org.eclipse.swt.custom.TableTreeItem;
-import org.eclipse.jface.viewers.*;
-
-
- /**
- * Adds a TableCursor to a StructuredViewer - for keyboard navigation of the table
- * The intent of this class is to provide the standard listeners for using F2 to
- * activate cell editors.
- *
- * Due to a current bug in the TableCursor, TableViewers using this class must make
- * a call similar to the TableNavigator method moveCellEditorsAbove(cellEditors)
- * whenever a setCellEditors call is made in the StructuredViewer. This is so that the
- * cell editor control shows up above the table cursor control.
- */
-
-public class TableNavigator extends TableCursor
-{
- private static final String TABLETREEITEM_ID = "TableTreeItemID";
-
- final Table table;
-
- public TableNavigator(Table table, StructuredViewer viewer)
- {
- super(table, SWT.NONE);
- this.table = table;
- final Table currentTable = table;
- final StructuredViewer sViewer = viewer;
-
- // Linux index out of bounds fix. See defect 253429, 253433, and more
- setVisible(false);
-
- addPaintListener(viewer);
- addKeyListeners(viewer);
- addMouseListeners(viewer);
- addSelectionListener(new SelectionAdapter()
- {
- /**
- * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- if (sViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
- StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
- sViewer.setSelection(selection, true);
- }
- }
-
-
- });
- addFocusListener(new FocusAdapter(){
- public void focusGained(FocusEvent e)
- {
- // if e.source is not a child of the table then set selection - this is for tab into viewer
- Object eventSource = e.getSource();
- if (eventSource instanceof Control)
- {
- if (!isChild(currentTable, (Control)eventSource))
- {
- if (currentTable.getItemCount() > 0 && currentTable.getSelectionCount() <= 0)
- {
- if (sViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
- StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
- sViewer.setSelection(selection, true);
- }
- else
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- }
- }
- else
- {
- if (currentTable.getItems().length > 0)
- {
- // cursor can end up on a non-existent table row
- // currently no way to get the current table cursor row
- // so for now just catch the exception since it doesn't
- // cause any side effects.
- try
- {
- setVisible(true);
- }
- catch (Exception ee)
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- }
- else // do not show table cursor if there are no elements in the table - avoid repaint
- {
- setVisible(false);
- }
- }
- }
- }
-
- protected boolean isChild(Control parent, Control child)
- {
- Control tempChild = child;
- while (tempChild != null)
- {
- if (tempChild == parent)
- {
- return true;
- }
- tempChild = tempChild.getParent();
- }
- return false;
- }
-
- /**
- * @see org.eclipse.swt.events.FocusAdapter#focusLost(FocusEvent)
- */
- public void focusLost(FocusEvent e)
- {
- // Set the table navigator to be not visible if the the table
- // is not in focus and a child of the table is not in focus
- // note that we do this asynchronously so we don't mess up the
- // current focus handling.
- Display.getDefault().asyncExec(new Runnable()
- {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run()
- {
- if (currentTable != null && !currentTable.isDisposed() && !currentTable.isFocusControl() &&
- !isChild(currentTable, Display.getDefault().getFocusControl()))
- {
- setVisible(false);
- }
- }
- });
- }
-
- });
-
-
-
-
- table.addFocusListener(new FocusAdapter()
- {
- /**
- * @see org.eclipse.swt.events.FocusListener#focusGained(FocusEvent)
- */
- public void focusGained(FocusEvent e)
- {
- // only display navigator if there are items in the table
- // and if the focus wasn't gained from our own table navigator
- // (ie focus came from outside)
- if (currentTable.getItemCount() > 0 &&
- (Display.getDefault().getFocusControl() != null) &&
- !Display.getDefault().getFocusControl().equals(TableNavigator.this))
- {
- // note that we do this asynchronously so we don't mess up the
- // current focus handling.
- Display.getDefault().asyncExec(new Runnable()
- {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run()
- {
- if (!isVisible())
- {
- try
- {
- setVisible(true);
- setFocus();
- }
- catch (Exception e)
- {
- // catch IllegalArgumentExceptions here - index out of bounds on tableviewer
- if (currentTable.getItemCount() > 0)
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- else // do not show table cursor if there are no elements in the table - avoid repaint
- {
- setVisible(false);
- }
- }
- }
- }
- });
- }
- }
- });
- }
-
- public Table getTable()
- {
- return table;
- }
-
- public void addPaintListener(StructuredViewer viewer)
- {
-
- addPaintListener(new PaintListener()
- {
- public void paintControl(PaintEvent e)
- {
- TableItem[] selection = table.getSelection();
- final TableItem row = (selection.length == 0) ? table.getItem(table.getTopIndex()) : selection[0];
- final String cellText = row.getText(getColumn());
- final Image cellImage = row.getImage(getColumn());
- final int col = getColumn();
-
- Display.getCurrent().asyncExec(new Runnable()
- {
- public void run()
- {
- if (!row.isDisposed())
- {
- String newText = row.getText(getColumn());
- if (!newText.equals(cellText) || !(row.getImage(col) == cellImage))
- {
- redraw();
- }
- }
- }
- });
- }
- });
- }
-
-
- public SelectionKeyAdapter getKeyAdapter(StructuredViewer viewer)
- {
- if (keyAdapter == null)
- {
- return new SelectionKeyAdapter(viewer);
- }
- else return keyAdapter;
- }
-
- public void setKeyAdapter(SelectionKeyAdapter kAdapter)
- {
- keyAdapter = kAdapter;
- }
-
- protected SelectionKeyAdapter keyAdapter = null;
-
- public class SelectionKeyAdapter extends KeyAdapter
- {
- StructuredViewer structuredViewer;
-
- public SelectionKeyAdapter(StructuredViewer viewer)
- {
- super();
- this.structuredViewer = viewer;
- }
-
- int lastKeyPressed = -1; // used to cache the last key for key combos
-
- public void keyPressed(KeyEvent e)
- {
- TableItem row = getRow();
- int column = getColumn();
-
- // hack to emulate SHIFT+F10 popup menu - otherwise table cursor
- // obscures the table popup mechanism and it doesn't work.
- if (lastKeyPressed == SWT.SHIFT && e.keyCode == SWT.F10)
- {
- Menu popup = getTable().getMenu();
- popup.setVisible(true);
- }
- lastKeyPressed = e.keyCode;
-
- //jvh - look for + or - key
- // column == 0
- if (row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
- {
- if (column == 0 && e.character == '+')
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), true);
- refresh();
- }
- else if (column == 0 && e.character == '-')
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), false);
- refresh();
- }
- }
- // use F2 to invoke editing for a cell
- if (e.keyCode == SWT.F2)
- {
- if (structuredViewer instanceof TableViewer)
- {
- ((TableViewer)structuredViewer).editElement(row.getData(), column);
- }
- else if (structuredViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
- }
- }
- }
- }
-
- public void addKeyListeners(StructuredViewer viewer)
- {
- final StructuredViewer structuredViewer = viewer;
-
- addKeyListener(getKeyAdapter(structuredViewer));
- }
-
- public void addMouseListeners(StructuredViewer viewer)
- {
- final StructuredViewer structuredViewer = viewer;
-
- addMouseListener(new MouseAdapter()
- {
-
- public void mouseUp(MouseEvent e)
- {
- TableItem row = getRow();
- int column = getColumn();
-
- // use mouse button 1 to invoke editing for a cell
- if (e.button == 1)
- {
- if (structuredViewer instanceof TableViewer)
- {
- ((TableViewer)structuredViewer).editElement(row.getData(), column);
- }
- else if (structuredViewer instanceof TableTreeViewer && column == 1)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
- }
-
- if (structuredViewer instanceof TableTreeViewer && row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
- {
- if (column == 0)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- boolean expandState = tableTreeItem.getExpanded();
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), !expandState);
- refresh();
- }
- }
- }
- }
- });
- }
-
-
- /**
- * Ensure that cell editor control shows up above the table cursor control.
- * Should be called whenever the table viewer makes a new call to setCellEditors
- * i.e. in constructor and in refreshCellEditors
- *
- * @param - array of cell editors for the StructuredViewer
- */
-
- public void moveCellEditorsAbove(CellEditor[] editorArray)
- {
- for (int i = 0; i < editorArray.length ; i++)
- {
- CellEditor cEd = editorArray[i];
- if (cEd != null && cEd.getControl() != null)
- {
- cEd.getControl().moveAbove(null);
- }
- }
- }
-
- public void refresh()
- {
- Display.getCurrent().asyncExec(new Runnable()
- {
- public void run()
- {
- if (!isDisposed() && isVisible())
- redraw();
- }
- });
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageEditorSite.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageEditorSite.java
deleted file mode 100644
index ee280ca..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageEditorSite.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.provisional.editors;
-
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.MultiPageEditorSite;
-
-/**
- * @deprecated - No longer necessary as of 3.2M3.
- */
-public class PostMultiPageEditorSite extends MultiPageEditorSite {
- /**
- * The post selection change listener, initialized lazily;
- * <code>null</code> if not yet created.
- */
- private ISelectionChangedListener postSelectionChangedListener = null;
-
- public PostMultiPageEditorSite(MultiPageEditorPart multiPageEditor, IEditorPart editor) {
- super(multiPageEditor, editor);
- }
-
- /**
- * Returns the selection changed listener which listens to the nested
- * editor's post selection changes, and calls
- * <code>handlePostSelectionChanged</code>.
- *
- * @return the selection changed listener
- */
- private ISelectionChangedListener getPostSelectionChangedListener() {
- if (postSelectionChangedListener == null) {
- postSelectionChangedListener = new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- PostMultiPageEditorSite.this.handlePostSelectionChanged(event);
- }
- };
- }
- return postSelectionChangedListener;
- }
-
- /**
- * Handles a post selection changed event from the nested editor. The
- * default implementation gets the selection provider from the multi-page
- * editor's site, and calls <code>firePostSelectionChanged</code> on it
- * (only if it is an instance of <code>MultiPageSelectionProvider</code>),
- * passing a new event object.
- * <p>
- * Subclasses may extend or reimplement this method.
- * </p>
- *
- * @param event
- * the event
- */
- protected void handlePostSelectionChanged(SelectionChangedEvent event) {
- ISelectionProvider parentProvider = getMultiPageEditor().getSite().getSelectionProvider();
- if (parentProvider instanceof PostMultiPageSelectionProvider) {
- SelectionChangedEvent newEvent = new SelectionChangedEvent(parentProvider, event.getSelection());
- ((PostMultiPageSelectionProvider) parentProvider).firePostSelectionChanged(newEvent);
- }
- }
-
- /**
- * The <code>MultiPageEditorSite</code> implementation of this
- * <code>IWorkbenchPartSite</code> method remembers the selection
- * provider, and also hooks a listener on it, which calls
- * <code>handleSelectionChanged</code> when a selection changed event
- * occurs and <code>handlePostSelectionChanged</code> when a post
- * selection changed event occurs.
- *
- * @param provider
- * The selection provider.
- * @see PostMultiPageEditorSite#handleSelectionChanged(SelectionChangedEvent)
- */
- public void setSelectionProvider(ISelectionProvider provider) {
- ISelectionProvider oldSelectionProvider = getSelectionProvider();
- if (oldSelectionProvider != null) {
- if (oldSelectionProvider instanceof IPostSelectionProvider) {
- ((IPostSelectionProvider) oldSelectionProvider).removePostSelectionChangedListener(getPostSelectionChangedListener());
- }
- }
-
- super.setSelectionProvider(provider);
-
- if (provider != null) {
- if (provider instanceof IPostSelectionProvider) {
- ((IPostSelectionProvider) provider).addPostSelectionChangedListener(getPostSelectionChangedListener());
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageSelectionProvider.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageSelectionProvider.java
deleted file mode 100644
index 3a4f908..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostMultiPageSelectionProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.provisional.editors;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
-
-/**
- * @deprecated - No longer necessary as of 3.2M3.
- */
-public class PostMultiPageSelectionProvider extends MultiPageSelectionProvider implements IPostSelectionProvider {
- private ListenerList postListeners;
-
- public PostMultiPageSelectionProvider(MultiPageEditorPart multiPageEditor) {
- super(multiPageEditor);
- postListeners = new ListenerList();
- }
-
- public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
- postListeners.add(listener);
- }
-
- public void firePostSelectionChanged(final SelectionChangedEvent event) {
- Object[] listeners = postListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener pl = (ISelectionChangedListener) listeners[i];
- Platform.run(new SafeRunnable() {
- public void run() {
- pl.selectionChanged(event);
- }
- });
- }
- }
-
- public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
- postListeners.remove(listener);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostSelectionMultiPageEditorPart.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostSelectionMultiPageEditorPart.java
deleted file mode 100644
index bcd2f07..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/provisional/editors/PostSelectionMultiPageEditorPart.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.ui.provisional.editors;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.MultiPageEditorPart;
-
-/**
- * Adds posts selection notifications from contained editor parts to
- * listeners. This part was created as a workaround for
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=108324 and will be removed
- * once WTP is building on a platform milestone that includes a fix.
- *
- * @deprecated - No longer necessary as of 3.2M3.
- */
-public abstract class PostSelectionMultiPageEditorPart extends MultiPageEditorPart {
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
- super.init(site, input);
- site.setSelectionProvider(new PostMultiPageSelectionProvider(this));
- }
-
- protected void pageChange(int newPageIndex) {
- super.pageChange(newPageIndex);
- IEditorPart activeEditor = getEditor(newPageIndex);
- if (activeEditor != null) {
- ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();
- if (selectionProvider != null) {
- SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());
- ((PostMultiPageSelectionProvider) getSite().getSelectionProvider()).firePostSelectionChanged(event);
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.classpath b/plugins/org.eclipse.wst.common.uriresolver/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.cvsignore b/plugins/org.eclipse.wst.common.uriresolver/.cvsignore
deleted file mode 100644
index 30d3363..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-uriresolver.jar
-build.xml
-temp.folder
-org.eclipse.wst.common.uriresolver_1.0.0.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.project b/plugins/org.eclipse.wst.common.uriresolver/.project
deleted file mode 100644
index e19b693..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.uriresolver</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.uriresolver/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b8a0d61..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 19:48:07 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-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=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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=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.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.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.3
diff --git a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
deleted file mode 100644
index 202c7b5..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.uriresolver; singleton:=true
-Bundle-Version: 1.1.201.qualifier
-Bundle-Activator: org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.uriresolver.internal,
- org.eclipse.wst.common.uriresolver.internal.provisional,
- org.eclipse.wst.common.uriresolver.internal.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.uriresolver/README.txt b/plugins/org.eclipse.wst.common.uriresolver/README.txt
deleted file mode 100644
index acaf514..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-API for an URI resolver.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.uriresolver/about.html b/plugins/org.eclipse.wst.common.uriresolver/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/build.properties b/plugins/org.eclipse.wst.common.uriresolver/build.properties
deleted file mode 100644
index a1aa98a..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- schema/
-bin.excludes = bin/**,\
- @dot/**,\
- temp.folder/**
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.uriresolver/plugin.properties b/plugins/org.eclipse.wst.common.uriresolver/plugin.properties
deleted file mode 100644
index 307664b..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=Common URI Resolver Framework
-###############################################################################
-
-resolverExtensions=URI Resolver Extensions Point
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.uriresolver/plugin.xml b/plugins/org.eclipse.wst.common.uriresolver/plugin.xml
deleted file mode 100644
index 9aa99c4..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="resolverExtensions" name="%resolverExtensions" schema="schema/resolverExtensions.exsd"/>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd b/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
deleted file mode 100644
index 702bb0c..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/schema/resolverExtensions.exsd
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.uriresolver">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.uriresolver" id="resolverExtensions" name="URI Resolver Extensions Point"/>
- </appInfo>
- <documentation>
- The URI Resolver Extensions point allows clients to register custom URI resolvers that will be used in the resolution of resources by tools such as editors, generators, validators, and wizards.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="resolverExtension" 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>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="resolverExtension">
- <complexType>
- <sequence>
- <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="stage" type="string">
- <annotation>
- <documentation>
- The stage in which to run this extension resolver: prenormalization, postnormalization, or physical. Defaults to postnormalization.<br>
-prenormalization: run before normalization of the input<br>
-postnormalization: run after normalization of the input<br>
-physical: run after all pre and postnormalization resolvers
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The class that implements <code>org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver</code>.
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="priority" type="string">
- <annotation>
- <documentation>
- The priority of this resolver: high, medium, or low. Defaults to medium. The priority allows you to specify when this resolver should run with respect to other resolvers defined for the same stage.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectNature">
- <annotation>
- <documentation>
- If a project nature is specified the URI resolver will only be used for projects that contain one of the specified project natures. If no project natures are specified the URI resolver will be used for all projects.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="value" type="string" use="required">
- <annotation>
- <documentation>
- A project nature ID for which the URI resolver should be used.
- </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>
- The following is an example of an URI resolver contribution:
-<pre>
- <extension
- point="org.eclipse.wst.common.uriresolver.resolverExtensions">
- <resolverExtension
- stage="physical"
- priority="low"
- class="org.eclipse.wst.common.uriresolver.SampleResolver">
- </resolverExtension>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The supplied class must implement <code>org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver</code>.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- <code>
-org.eclipse.wst.common.componentcore.internal.util.ComponentResolver
-</code>
-provides an URI resolver that resolves references in a project with multiple components
-<code>
-org.eclipse.wst.internet.cache.internal.CacheURIResolverExtension
-</code>
-provides an URI resolver that resolves references in a cache
-<code>
-org.eclipse.wst.xml.core.internal.catalog.XMLCatalogURIResolverExtension
-</code>
-provides an URI resolver that resolves references from an XML catalog
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2000, 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.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java
deleted file mode 100644
index e9b2c17..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java
+++ /dev/null
@@ -1,203 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.osgi.framework.Bundle;
-
-
-/**
- * @author csalter
- *
- */
-public class ExtensibleURIResolver implements URIResolver
-{
- private static final boolean logExceptions = false;
-
- //protected IProject project;
-
- //TODO... consider ctor that takes a project arg
- //public ExtensibleURIResolver(IProject project)
- //{
- // this.project = project;
- //}
-
- public ExtensibleURIResolver()
- {
- }
-
- public String resolve(String baseLocation, String publicId, String systemId)
- {
- String result = systemId;
-
- // compute the project that holds the resource
- //
- IFile file = computeFile(baseLocation);
- IProject project = file != null ? file.getProject() : null;
-
- URIResolverExtensionRegistry resolverRegistry = URIResolverExtensionRegistry.getIntance();
- List list = resolverRegistry.getExtensionDescriptors(project);
-
- // get the list of applicable pre-normalized resolvers from the
- // extension registry
- //
- for (Iterator i = resolverRegistry.getMatchingURIResolvers(list, URIResolverExtensionRegistry.STAGE_PRENORMALIZATION).iterator(); i.hasNext();)
- {
- URIResolverExtension resolver = (URIResolverExtension) i.next();
- String tempresult = resolver.resolve(file, baseLocation, publicId, result);
- if(tempresult != null)
- {
- result = tempresult;
- }
- }
-
- // normalize the uri
- //
- result = normalize(baseLocation, result);
-
- // get the list of applicable post-normalized resolvers from the
- // extension registry
- //
- for (Iterator i = resolverRegistry.getMatchingURIResolvers(list, URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION).iterator(); i.hasNext();)
- {
- URIResolverExtension resolver = (URIResolverExtension) i.next();
- String tempresult = resolver.resolve(file, baseLocation, publicId, result);
- if(tempresult != null)
- {
- result = tempresult;
- }
- }
-
- return result;
- }
-
- public String resolvePhysicalLocation(String baseLocation, String publicId, String logicalLocation)
- {
- String result = logicalLocation;
- URIResolverExtensionRegistry resolverRegistry = URIResolverExtensionRegistry.getIntance();
- IFile file = computeFile(baseLocation);
-
- // compute the project that holds the resource
- //
- IProject project = file != null ? file.getProject() : null;
- List list = resolverRegistry.getExtensionDescriptors(project);
- for (Iterator i = resolverRegistry.getMatchingURIResolvers(list, URIResolverExtensionRegistry.STAGE_PHYSICAL).iterator(); i.hasNext(); )
- {
- // get the list of applicable physical resolvers from the extension registry
- //
- while (i.hasNext())
- {
- URIResolverExtension resolver = (URIResolverExtension) i.next();
- String tempresult = resolver.resolve(file, baseLocation, publicId, result);
- if(tempresult != null)
- {
- result = tempresult;
- }
- }
- }
- return result;
- }
-
-
- protected String normalize(String baseLocation, String systemId)
- {
- // If no systemId has been specified there is nothing to do
- // so return null;
- if(systemId == null)
- return null;
- String result = systemId;
-
- // cs : sometimes normalizing the URI will cause an exception to get thrown
- // for example the 'bad' version of the URI below ...
- //
- // good = "jar:/resource/project-name/WebContent/WEB-INF/lib/generator.jar!/META-INF/schema/config.dtd"
- // bad = "jar:/resource/project-name/WebContent/WEB-INF/lib/generator.jar/META-INF/schema/config.dtd"
- //
- // Here we enclose the normalization in a try/catch block with the assumption that the caller
- // (i.e. the 'resolve' method) isn't interested in handling this exception.
- try
- {
- // normalize the URI
- URI systemURI = URI.createURI(systemId);
- if (systemURI.isRelative())
- {
- baseLocation = baseLocation.replace('\\','/');
- URI baseURI = URI.createURI(baseLocation);
-
- // TODO (cs) we should add more comments to explain this in a bit more detail
- try
- {
- result = systemURI.resolve(baseURI).toString();
- }
- catch (IllegalArgumentException e) {
- Bundle bundle = URIResolverPlugin.getInstance().getBundle();
- IStatus statusObj = null;
- java.net.URI baseURI2 = null;
- try {
- baseURI2 = java.net.URI.create(baseLocation);
- }
- catch (IllegalArgumentException e2) {
- if(logExceptions) {
- statusObj = new Status(IStatus.ERROR, bundle.getSymbolicName(), IStatus.ERROR, "Problem in creating java.net.URI in ExtensibleURIResolver:" + e2.getMessage(), e2); //$NON-NLS-1$
- Platform.getLog(bundle).log(statusObj);
- }
- }
- try {
- if(baseURI2 != null) {
- java.net.URI resultURI = baseURI2.resolve(systemId);
- result = resultURI.toString();
- }
- }
- catch (IllegalArgumentException e2) {
- if(logExceptions) {
- statusObj = new Status(IStatus.ERROR, bundle.getSymbolicName(), IStatus.ERROR, "Problem in resolving with java.net.URI in ExtensibleURIResolver:" + e2.getMessage(), null); //$NON-NLS-1$
- Platform.getLog(bundle).log(statusObj);
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- // just eat the exception and return back the original systemId
- }
- return result;
- }
-
- protected IFile computeFile(String baseLocation)
- {
- IFile file = null;
- if (baseLocation != null)
- {
- String pattern = "file:///"; //$NON-NLS-1$
- if (baseLocation.startsWith(pattern))
- {
- baseLocation = baseLocation.substring(pattern.length());
- }
- IPath path = new Path(baseLocation);
- file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
- }
- return file;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java
deleted file mode 100644
index 044d20b..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java
+++ /dev/null
@@ -1,2900 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A representation of a Uniform Resource Identifier (URI), as specified by
- * <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>, with certain
- * enhancements. A <code>URI</code> instance can be created by specifying
- * values for its components, or by providing a single URI string, which is
- * parsed into its components. Static factory methods whose names begin
- * with "create" are used for both forms of object creation. No public or
- * protected constructors are provided; this class can not be subclassed.
- *
- * <p>Like <code>String</code>, <code>URI</code> is an immutable class;
- * a <code>URI</code> instance offers several by-value methods that return a
- * new <code>URI</code> object based on its current state. Most useful,
- * a relative <code>URI</code> can be {@link #resolve(URI) resolve}d against
- * a base absolute <code>URI</code> -- the latter typically identifies the
- * document in which the former appears. The inverse to this is {@link
- * #deresolve(URI) deresolve}, which answers the question, "what relative
- * URI will resolve, against the given base, to this absolute URI?"
- *
- * <p>In the <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC</a>, much
- * attention is focused on a hierarchical naming system used widely to
- * locate resources via common protocols such as HTTP, FTP, and Gopher, and
- * to identify files on a local file system. Acordingly, most of this
- * class's functionality is for handling such URIs, which can be identified
- * via {@link #isHierarchical isHierarchical}.
- *
- * <p><a name="device_explanation">
- * The primary enhancement beyond the RFC description is an optional
- * device component. Instead of treating the device as just another segment
- * in the path, it can be stored as a separate component (almost a
- * sub-authority), with the root below it. For example, resolving
- * <code>/bar</code> against <code>file:///c:/foo</code> would result in
- * <code>file:///c:/bar</code> being returned. Also, you cannot take
- * the parent of a device, so resolving <code>..</code> against
- * <code>file:///c:/</code> would not yield <code>file:///</code>, as you
- * might expect. This feature is useful when working with file-scheme
- * URIs, as devices do not typically occur in protocol-based ones. A
- * device-enabled <code>URI</code> is created by parsing a string with
- * {@link #createURI(String) createURI}; if the first segment of the path
- * ends with the <code>:</code> character, it is stored (including the colon)
- * as the device, instead. Alternately, either the {@link
- * #createHierarchicalURI(String, String, String, String, String) no-path}
- * or the {@link #createHierarchicalURI(String, String, String, String[],
- * String, String) absolute-path} form of <code>createHierarchicalURI()</code>
- * can be used, in which a non-null <code>device</code> parameter can be
- * specified.
- *
- * <p><a name="archive_explanation">
- * The other enhancement provides support for the almost-hierarchical
- * form used for files within archives, such as the JAR scheme, defined
- * for the Java Platform in the documentation for {@link
- * java.net.JarURLConnection}. By default, this support is enabled for
- * absolute URIs with scheme equal to "jar", "zip", or "archive" (ignoring case), and
- * is implemented by a hierarchical URI, whose authority includes the
- * entire URI of the archive, up to and including the <code>!</code>
- * character. The URI of the archive must have no fragment. The whole
- * archive URI must have no device and an absolute path. Special handling
- * is supported for {@link #createURI creating}, {@link
- * #validArchiveAuthority validating}, {@link #devicePath getting the path}
- * from, and {@link #toString displaying} archive URIs. In all other
- * operations, including {@link #resolve(URI) resolving} and {@link
- * #deresolve(URI) deresolving}, they are handled like any ordinary URI.
- *
- * <p>This implementation does not impose the all of the restrictions on
- * character validity that are specified in the RFC. Static methods whose
- * names begin with "valid" are used to test whether a given string is valid
- * value for the various URI components. Presently, these tests place no
- * restrictions beyond what would have been required in order for {@link
- * createURI(String) createURI} to have parsed them correctly from a single
- * URI string. If necessary in the future, these tests may be made more
- * strict, to better coform to the RFC.
- *
- * <p>Another group of static methods, whose names begin with "encode", use
- * percent escaping to encode any characters that are not permitted in the
- * various URI components. Another static method is provided to {@link
- * #decode decode} encoded strings. An escaped character is represented as
- * a percent sybol (<code>%</code>), followed by two hex digits that specify
- * the character code. These encoding methods are more strict than the
- * validation methods described above. They ensure validity according to the
- * RFC, with one exception: non-ASCII characters.
- *
- * <p>The RFC allows only characters that can be mapped to 7-bit US-ASCII
- * representations. Non-ASCII, single-byte characters can be used only via
- * percent escaping, as described above. This implementation uses Java's
- * Unicode <code>char</code> and <code>String</code> representations, and
- * makes no attempt to encode characters 0xA0 and above. Characters in the
- * range 0x80-0x9F are still escaped. In this respect, this notion of a URI
- * is actually more like an IRI (Internationalized Resource Identifier), for
- * which an RFC is now in <href="http://www.w3.org/International/iri-edit/draft-duerst-iri-09.txt">draft
- * form</a>.
- *
- * <p>Finally, note the difference between a <code>null</code> parameter to
- * the static factory methods and an empty string. The former signifies the
- * absense of a given URI component, while the latter simply makes the
- * component blank. This can have a significant effect when resolving. For
- * example, consider the following two URIs: <code>/bar</code> (with no
- * authority) and <code>///bar</code> (with a blank authority). Imagine
- * resolving them against a base with an authority, such as
- * <code>http://www.eclipse.org/</code>. The former case will yield
- * <code>http://www.eclipse.org/bar</code>, as the base authority will be
- * preserved. In the latter case, the empty authority will override the
- * base authority, resulting in <code>http:///bar</code>!
- */
-public final class URI
-{
- // Common to all URI types.
- private final int hashCode;
- private final boolean hierarchical;
- private final String scheme; // null -> relative URI reference
- private final String authority;
- private final String fragment;
- private URI cachedTrimFragment;
- private String cachedToString;
- //private final boolean iri;
- //private URI cachedASCIIURI;
-
- // Applicable only to a hierarchical URI.
- private final String device;
- private final boolean absolutePath;
- private final String[] segments; // empty last segment -> trailing separator
- private final String query;
-
- // A cache of URIs, keyed by the strings from which they were created.
- // The fragment of any URI is removed before caching it here, to minimize
- // the size of the cache in the usual case where most URIs only differ by
- // the fragment.
- private static final Map uriCache = Collections.synchronizedMap(new HashMap());
-
- // The lower-cased schemes that will be used to identify archive URIs.
- private static final Set archiveSchemes;
-
- // Identifies a file-type absolute URI.
- private static final String SCHEME_FILE = "file";
- private static final String SCHEME_JAR = "jar";
- private static final String SCHEME_ZIP = "zip";
- private static final String SCHEME_ARCHIVE = "archive";
-
- // Special segment values interpreted at resolve and resolve time.
- private static final String SEGMENT_EMPTY = "";
- private static final String SEGMENT_SELF = ".";
- private static final String SEGMENT_PARENT = "..";
- private static final String[] NO_SEGMENTS = new String[0];
-
- // Separators for parsing a URI string.
- private static final char SCHEME_SEPARATOR = ':';
- private static final String AUTHORITY_SEPARATOR = "//";
- private static final char DEVICE_IDENTIFIER = ':';
- private static final char SEGMENT_SEPARATOR = '/';
- private static final char QUERY_SEPARATOR = '?';
- private static final char FRAGMENT_SEPARATOR = '#';
- private static final char USER_INFO_SEPARATOR = '@';
- private static final char PORT_SEPARATOR = ':';
- private static final char FILE_EXTENSION_SEPARATOR = '.';
- private static final char ARCHIVE_IDENTIFIER = '!';
- private static final String ARCHIVE_SEPARATOR = "!/";
-
- // Characters to use in escaping.
- private static final char ESCAPE = '%';
- private static final char[] HEX_DIGITS = {
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
- // Some character classes, as defined in RFC 2396's BNF for URI.
- // These are 128-bit bitmasks, stored as two longs, where the Nth bit is set
- // iff the ASCII character with value N is included in the set. These are
- // created with the highBitmask() and lowBitmask() methods defined below,
- // and a character is tested against them using matches().
- //
- private static final long ALPHA_HI = highBitmask('a', 'z') | highBitmask('A', 'Z');
- private static final long ALPHA_LO = lowBitmask('a', 'z') | lowBitmask('A', 'Z');
- private static final long DIGIT_HI = highBitmask('0', '9');
- private static final long DIGIT_LO = lowBitmask('0', '9');
- private static final long ALPHANUM_HI = ALPHA_HI | DIGIT_HI;
- private static final long ALPHANUM_LO = ALPHA_LO | DIGIT_LO;
- private static final long HEX_HI = DIGIT_HI | highBitmask('A', 'F') | highBitmask('a', 'f');
- private static final long HEX_LO = DIGIT_LO | lowBitmask('A', 'F') | lowBitmask('a', 'f');
- private static final long UNRESERVED_HI = ALPHANUM_HI | highBitmask("-_.!~*'()");
- private static final long UNRESERVED_LO = ALPHANUM_LO | lowBitmask("-_.!~*'()");
- private static final long RESERVED_HI = highBitmask(";/?:@&=+$,");
- private static final long RESERVED_LO = lowBitmask(";/?:@&=+$,");
- private static final long URIC_HI = RESERVED_HI | UNRESERVED_HI; // | ucschar | escaped
- private static final long URIC_LO = RESERVED_LO | UNRESERVED_LO;
-
- // Additional useful character classes, including characters valid in certain
- // URI components and separators used in parsing them out of a string.
- //
- private static final long SEGMENT_CHAR_HI = UNRESERVED_HI | highBitmask(";:@&=+$,"); // | ucschar | escaped
- private static final long SEGMENT_CHAR_LO = UNRESERVED_LO | lowBitmask(";:@&=+$,");
- private static final long PATH_CHAR_HI = SEGMENT_CHAR_HI | highBitmask('/'); // | ucschar | escaped
- private static final long PATH_CHAR_LO = SEGMENT_CHAR_LO | lowBitmask('/');
-// private static final long SCHEME_CHAR_HI = ALPHANUM_HI | highBitmask("+-.");
-// private static final long SCHEME_CHAR_LO = ALPHANUM_LO | lowBitmask("+-.");
- private static final long MAJOR_SEPARATOR_HI = highBitmask(":/?#");
- private static final long MAJOR_SEPARATOR_LO = lowBitmask(":/?#");
- private static final long SEGMENT_END_HI = highBitmask("/?#");
- private static final long SEGMENT_END_LO = lowBitmask("/?#");
-
- // Static initializer for archiveSchemes.
- static
- {
- Set set = new HashSet();
- set.add(SCHEME_JAR);
- set.add(SCHEME_ZIP);
- set.add(SCHEME_ARCHIVE);
-
-
- archiveSchemes = Collections.unmodifiableSet(set);
- }
-
- // Returns the lower half bitmask for the given ASCII character.
- private static long lowBitmask(char c)
- {
- return c < 64 ? 1L << c : 0L;
- }
-
- // Returns the upper half bitmask for the given ACSII character.
- private static long highBitmask(char c)
- {
- return c >= 64 && c < 128 ? 1L << (c - 64) : 0L;
- }
-
- // Returns the lower half bitmask for all ASCII characters between the two
- // given characters, inclusive.
- private static long lowBitmask(char from, char to)
- {
- long result = 0L;
- if (from < 64 && from <= to)
- {
- to = to < 64 ? to : 63;
- for (char c = from; c <= to; c++)
- {
- result |= (1L << c);
- }
- }
- return result;
- }
-
- // Returns the upper half bitmask for all AsCII characters between the two
- // given characters, inclusive.
- private static long highBitmask(char from, char to)
- {
- return to < 64 ? 0 : lowBitmask((char)(from < 64 ? 0 : from - 64), (char)(to - 64));
- }
-
- // Returns the lower half bitmask for all the ASCII characters in the given
- // string.
- private static long lowBitmask(String chars)
- {
- long result = 0L;
- for (int i = 0, len = chars.length(); i < len; i++)
- {
- char c = chars.charAt(i);
- if (c < 64) result |= (1L << c);
- }
- return result;
- }
-
- // Returns the upper half bitmask for all the ASCII characters in the given
- // string.
- private static long highBitmask(String chars)
- {
- long result = 0L;
- for (int i = 0, len = chars.length(); i < len; i++)
- {
- char c = chars.charAt(i);
- if (c >= 64 && c < 128) result |= (1L << (c - 64));
- }
- return result;
- }
-
- // Returns whether the given character is in the set specified by the given
- // bitmask.
- private static boolean matches(char c, long highBitmask, long lowBitmask)
- {
- if (c >= 128) return false;
- return c < 64 ?
- ((1L << c) & lowBitmask) != 0 :
- ((1L << (c - 64)) & highBitmask) != 0;
- }
-
- // Debugging method: converts the given long to a string of binary digits.
-/*
- private static String toBits(long l)
- {
- StringBuffer result = new StringBuffer();
- for (int i = 0; i < 64; i++)
- {
- boolean b = (l & 1L) != 0;
- result.insert(0, b ? '1' : '0');
- l >>= 1;
- }
- return result.toString();
- }
-*/
-
- /**
- * Static factory method for a generic, non-hierarchical URI. There is no
- * concept of a relative non-hierarchical URI; such an object cannot be
- * created.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code> is
- * null, if <code>scheme</code> is an <a href="#archive_explanation">archive
- * URI</a> scheme, or if <code>scheme</code>, <code>opaquePart</code>, or
- * <code>fragment</code> is not valid according to {@link #validScheme
- * validScheme}, {@link #validOpaquePart validOpaquePart}, or {@link
- * #validFragment validFragment}, respectively.
- */
- public static URI createGenericURI(String scheme, String opaquePart,
- String fragment)
- {
- if (scheme == null)
- {
- throw new IllegalArgumentException("relative non-hierarchical URI");
- }
-
- if (isArchiveScheme(scheme))
- {
- throw new IllegalArgumentException("non-hierarchical archive URI");
- }
-
- validateURI(false, scheme, opaquePart, null, false, NO_SEGMENTS, null, fragment);
- return new URI(false, scheme, opaquePart, null, false, NO_SEGMENTS, null, fragment);
- }
-
- /**
- * Static factory method for a hierarchical URI with no path. The
- * URI will be relative if <code>scheme</code> is non-null, and absolute
- * otherwise. An absolute URI with no path requires a non-null
- * <code>authority</code> and/or <code>device</code>.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code> is
- * non-null while <code>authority</code> and <code>device</code> are null,
- * if <code>scheme</code> is an <a href="#archive_explanation">archive
- * URI</a> scheme, or if <code>scheme</code>, <code>authority</code>,
- * <code>device</code>, <code>query</code>, or <code>fragment</code> is not
- * valid according to {@link #validScheme validSheme}, {@link
- * #validAuthority validAuthority}, {@link #validDevice validDevice},
- * {@link #validQuery validQuery}, or {@link #validFragment validFragment},
- * respectively.
- */
- public static URI createHierarchicalURI(String scheme, String authority,
- String device, String query,
- String fragment)
- {
- if (scheme != null && authority == null && device == null)
- {
- throw new IllegalArgumentException(
- "absolute hierarchical URI without authority, device, path");
- }
-
- if (isArchiveScheme(scheme))
- {
- throw new IllegalArgumentException("archive URI with no path");
- }
-
- validateURI(true, scheme, authority, device, false, NO_SEGMENTS, query, fragment);
- return new URI(true, scheme, authority, device, false, NO_SEGMENTS, query, fragment);
- }
-
- /**
- * Static factory method for a hierarchical URI with absolute path.
- * The URI will be relative if <code>scheme</code> is non-null, and
- * absolute otherwise.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. As an absolute path, it is automatically
- * preceeded by a <code>/</code> separator. If desired, a trailing
- * separator should be represented by an empty-string segment as the last
- * element of the array.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code> is
- * an <a href="#archive_explanation">archive URI</a> scheme and
- * <code>device</code> is non-null, or if <code>scheme</code>,
- * <code>authority</code>, <code>device</code>, <code>segments</code>,
- * <code>query</code>, or <code>fragment</code> is not valid according to
- * {@link #validScheme validScheme}, {@link #validAuthority validAuthority}
- * or {@link #validArchiveAuthority validArchiveAuthority}, {@link
- * #validDevice validDevice}, {@link #validSegments validSegments}, {@link
- * #validQuery validQuery}, or {@link #validFragment validFragment}, as
- * appropriate.
- */
- public static URI createHierarchicalURI(String scheme, String authority,
- String device, String[] segments,
- String query, String fragment)
- {
- if (isArchiveScheme(scheme) && device != null)
- {
- throw new IllegalArgumentException("archive URI with device");
- }
-
- segments = fix(segments);
- validateURI(true, scheme, authority, device, true, segments, query, fragment);
- return new URI(true, scheme, authority, device, true, segments, query, fragment);
- }
-
- /**
- * Static factory method for a relative hierarchical URI with relative
- * path.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. A trailing separator is represented by an
- * empty-string segment at the end of the array.
- *
- * @exception java.lang.IllegalArgumentException if <code>segments</code>,
- * <code>query</code>, or <code>fragment</code> is not valid according to
- * {@link #validSegments validSegments}, {@link #validQuery validQuery}, or
- * {@link #validFragment validFragment}, respectively.
- */
- public static URI createHierarchicalURI(String[] segments, String query,
- String fragment)
- {
- segments = fix(segments);
- validateURI(true, null, null, null, false, segments, query, fragment);
- return new URI(true, null, null, null, false, segments, query, fragment);
- }
-
- // Converts null to length-zero array, and clones array to ensure
- // immutability.
- private static String[] fix(String[] segments)
- {
- return segments == null ? NO_SEGMENTS : (String[])segments.clone();
- }
-
- /**
- * Static factory method based on parsing a URI string, with
- * <a href="#device_explanation">explicit device support</a> and handling
- * for <a href="#archive_explanation">archive URIs</a> enabled. The
- * specified string is parsed as described in <a
- * href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>, and an
- * appropriate <code>URI</code> is created and returned. Note that
- * validity testing is not as strict as in the RFC; essentially, only
- * separator characters are considered. So, for example, non-Latin
- * alphabet characters appearing in the scheme would not be considered an
- * error.
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme
- * validScheme}, {@link #validOpaquePart validOpaquePart}, {@link
- * #validAuthority validAuthority}, {@link #validArchiveAuthority
- * validArchiveAuthority}, {@link #validDevice validDevice}, {@link
- * #validSegments validSegments}, {@link #validQuery validQuery}, or {@link
- * #validFragment validFragment}, as appropriate.
- */
- public static URI createURI(String uri)
- {
- return createURIWithCache(uri);
- }
-
- /**
- * Static factory method that encodes and parses the given URI string.
- * Appropriate encoding is performed for each component of the URI.
- * If more than one <code>#</code> is in the string, the last one is
- * assumed to be the fragment's separator, and any others are encoded.
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme
- * validScheme}, {@link #validOpaquePart validOpaquePart}, {@link
- * #validAuthority validAuthority}, {@link #validArchiveAuthority
- * validArchiveAuthority}, {@link #validDevice validDevice}, {@link
- * #validSegments validSegments}, {@link #validQuery validQuery}, or {@link
- * #validFragment validFragment}, as appropriate.
- */
- public static URI createURI(String uri, boolean ignoreEscaped)
- {
- return createURIWithCache(encodeURI(uri, ignoreEscaped));
- }
-
- /**
- * Static factory method based on parsing a URI string, with
- * <a href="#device_explanation">explicit device support</a> enabled.
- * Note that validity testing is not a strict as in the RFC; essentially,
- * only separator characters are considered. So, for example, non-Latin
- * alphabet characters appearing in the scheme would not be considered an
- * error.
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme
- * validScheme}, {@link #validOpaquePart validOpaquePart}, {@link
- * #validAuthority validAuthority}, {@link #validArchiveAuthority
- * validArchiveAuthority}, {@link #validDevice validDevice}, {@link
- * #validSegments validSegments}, {@link #validQuery validQuery}, or {@link
- * #validFragment validFragment}, as appropriate.
- *
- * @deprecated Use {@link #createURI createURI}, which now has explicit
- * device support enabled. The two methods now operate identically.
- */
- public static URI createDeviceURI(String uri)
- {
- return createURIWithCache(uri);
- }
-
- // Uses a cache to speed up creation of a URI from a string. The cache
- // is consulted to see if the URI, less any fragment, has already been
- // created. If needed, the fragment is re-appended to the cached URI,
- // which is considerably more efficient than creating the whole URI from
- // scratch. If the URI wasn't found in the cache, it is created using
- // parseIntoURI() and then cached. This method should always be used
- // by string-parsing factory methods, instead of parseIntoURI() directly.
- /**
- * This method was included in the public API by mistake.
- *
- * @deprecated Please use {@link #createURI createURI} instead.
- */
- public static URI createURIWithCache(String uri)
- {
- int i = uri.indexOf(FRAGMENT_SEPARATOR);
- String base = i == -1 ? uri : uri.substring(0, i);
- String fragment = i == -1 ? null : uri.substring(i + 1);
-
- URI result = (URI)uriCache.get(base);
-
- if (result == null)
- {
- result = parseIntoURI(base);
- uriCache.put(base, result);
- }
-
- if (fragment != null)
- {
- result = result.appendFragment(fragment);
- }
- return result;
- }
-
- // String-parsing implementation.
- private static URI parseIntoURI(String uri)
- {
- boolean hierarchical = true;
- String scheme = null;
- String authority = null;
- String device = null;
- boolean absolutePath = false;
- String[] segments = NO_SEGMENTS;
- String query = null;
- String fragment = null;
-
- int i = 0;
- int j = find(uri, i, MAJOR_SEPARATOR_HI, MAJOR_SEPARATOR_LO);
-
- if (j < uri.length() && uri.charAt(j) == SCHEME_SEPARATOR)
- {
- scheme = uri.substring(i, j);
- i = j + 1;
- }
-
- boolean archiveScheme = isArchiveScheme(scheme);
- if (archiveScheme)
- {
- j = uri.lastIndexOf(ARCHIVE_SEPARATOR);
- if (j == -1)
- {
- throw new IllegalArgumentException("no archive separator");
- }
- hierarchical = true;
- authority = uri.substring(i, ++j);
- i = j;
- }
- else if (uri.startsWith(AUTHORITY_SEPARATOR, i))
- {
- i += AUTHORITY_SEPARATOR.length();
- j = find(uri, i, SEGMENT_END_HI, SEGMENT_END_LO);
- authority = uri.substring(i, j);
- i = j;
- }
- else if (scheme != null &&
- (i == uri.length() || uri.charAt(i) != SEGMENT_SEPARATOR))
- {
- hierarchical = false;
- j = uri.indexOf(FRAGMENT_SEPARATOR, i);
- if (j == -1) j = uri.length();
- authority = uri.substring(i, j);
- i = j;
- }
-
- if (!archiveScheme && i < uri.length() && uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- j = find(uri, i + 1, SEGMENT_END_HI, SEGMENT_END_LO);
- String s = uri.substring(i + 1, j);
-
- if (s.length() > 0 && s.charAt(s.length() - 1) == DEVICE_IDENTIFIER)
- {
- device = s;
- i = j;
- }
- }
-
- if (i < uri.length() && uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- i++;
- absolutePath = true;
- }
-
- if (segmentsRemain(uri, i))
- {
- List segmentList = new ArrayList();
-
- while (segmentsRemain(uri, i))
- {
- j = find(uri, i, SEGMENT_END_HI, SEGMENT_END_LO);
- segmentList.add(uri.substring(i, j));
- i = j;
-
- if (i < uri.length() && uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- if (!segmentsRemain(uri, ++i)) segmentList.add(SEGMENT_EMPTY);
- }
- }
- segments = new String[segmentList.size()];
- segmentList.toArray(segments);
- }
-
- if (i < uri.length() && uri.charAt(i) == QUERY_SEPARATOR)
- {
- j = uri.indexOf(FRAGMENT_SEPARATOR, ++i);
- if (j == -1) j = uri.length();
- query = uri.substring(i, j);
- i = j;
- }
-
- if (i < uri.length()) // && uri.charAt(i) == FRAGMENT_SEPARATOR (implied)
- {
- fragment = uri.substring(++i);
- }
-
- validateURI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
- return new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
- }
-
- // Checks whether the string contains any more segments after the one that
- // starts at position i.
- private static boolean segmentsRemain(String uri, int i)
- {
- return i < uri.length() && uri.charAt(i) != QUERY_SEPARATOR &&
- uri.charAt(i) != FRAGMENT_SEPARATOR;
- }
-
- // Finds the next occurance of one of the characters in the set represented
- // by the given bitmask in the given string, beginning at index i. The index
- // of the first found character, or s.length() if there is none, is
- // returned. Before searching, i is limited to the range [0, s.length()].
- //
- private static int find(String s, int i, long highBitmask, long lowBitmask)
- {
- int len = s.length();
- if (i >= len) return len;
-
- for (i = i > 0 ? i : 0; i < len; i++)
- {
- if (matches(s.charAt(i), highBitmask, lowBitmask)) break;
- }
- return i;
- }
-
- /**
- * Static factory method based on parsing a {@link java.io.File} path
- * string. The <code>pathName</code> is converted into an appropriate
- * form, as follows: platform specific path separators are converted to
- * <code>/<code>; the path is encoded; and a "file" scheme and, if missing,
- * a leading <code>/</code>, are added to an absolute path. The result
- * is then parsed using {@link #createURI(String) createURI}.
- *
- * <p>The encoding step escapes all spaces, <code>#</code> characters, and
- * other characters disallowed in URIs, as well as <code>?</code>, which
- * would delimit a path from a query. Decoding is automatically performed
- * by {@link #toFileString toFileString}, and can be applied to the values
- * returned by other accessors by via the static {@link #decode(String)
- * decode} method.
- *
- * <p>A relative path with a specified device (something like
- * <code>C:myfile.txt</code>) cannot be expressed as a valid URI.
- *
- * @exception java.lang.IllegalArgumentException if <code>pathName</code>
- * specifies a device and a relative path, or if any component of the path
- * is not valid according to {@link #validAuthority validAuthority}, {@link
- * #validDevice validDevice}, or {@link #validSegments validSegments},
- * {@link #validQuery validQuery}, or {@link #validFragment validFragment}.
- */
- public static URI createFileURI(String pathName)
- {
- File file = new File(pathName);
- String uri = File.separatorChar != '/' ? pathName.replace(File.separatorChar, SEGMENT_SEPARATOR) : pathName;
- uri = encode(uri, PATH_CHAR_HI, PATH_CHAR_LO, false);
- if (file.isAbsolute())
- {
- URI result = createURI((uri.charAt(0) == SEGMENT_SEPARATOR ? "file:" : "file:/") + uri);
- return result;
- }
- else
- {
- URI result = createURI(uri);
- if (result.scheme() != null)
- {
- throw new IllegalArgumentException("invalid relative pathName: " + pathName);
- }
- return result;
- }
- }
-
- /**
- * Static factory method based on parsing a platform-relative path string.
- *
- * <p>The <code>pathName</code> must be of the form:
- * <pre>
- * /project-name/path</pre>
- *
- * <p>Platform-specific path separators will be converterted to slashes.
- * If not included, the leading path separator will be added. The
- * result will be of this form, which is parsed using {@link #createURI
- * createURI}:
- * <pre>
- * platform:/resource/project-name/path</pre>
- *
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from the path is not valid according to {@link #validDevice validDevice},
- * {@link #validSegments validSegments}, {@link #validQuery validQuery}, or
- * {@link #validFragment validFragment}.
- *
- * @see org.eclipse.core.runtime.Platform#resolve
- * @see #createPlatformResourceURI(String, boolean)
- */
- public static URI createPlatformResourceURI(String pathName)
- {
- return createPlatformResourceURI(pathName, false);
- }
-
- /**
- * Static factory method based on parsing a platform-relative path string,
- * with an option to encode the created URI.
- *
- * <p>The <code>pathName</code> must be of the form:
- * <pre>
- * /project-name/path</pre>
- *
- * <p>Platform-specific path separators will be converterted to slashes.
- * If not included, the leading path separator will be added. The
- * result will be of this form, which is parsed using {@link #createURI
- * createURI}:
- * <pre>
- * platform:/resource/project-name/path</pre>
- *
- * <p>This scheme supports relocatable projects in Eclipse and in
- * stand-alone .
- *
- * <p>Depending on the <code>encode</code> argument, the path may be
- * automatically encoded to escape all spaces, <code>#</code> characters,
- * and other characters disallowed in URIs, as well as <code>?</code>,
- * which would delimit a path from a query. Decoding can be performed with
- * the static {@link #decode(String) decode} method.
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from the path is not valid according to {@link #validDevice validDevice},
- * {@link #validSegments validSegments}, {@link #validQuery validQuery}, or
- * {@link #validFragment validFragment}.
- *
- * @see org.eclipse.core.runtime.Platform#resolve
- */
- public static URI createPlatformResourceURI(String pathName, boolean encode)
- {
- if (File.separatorChar != SEGMENT_SEPARATOR)
- {
- pathName = pathName.replace(File.separatorChar, SEGMENT_SEPARATOR);
- }
-
- if (encode)
- {
- pathName = encode(pathName, PATH_CHAR_HI, PATH_CHAR_LO, false);
- }
- URI result = createURI((pathName.charAt(0) == SEGMENT_SEPARATOR ? "platform:/resource" : "platform:/resource/") + pathName);
- return result;
- }
-
- // Private constructor for use of static factory methods.
- private URI(boolean hierarchical, String scheme, String authority,
- String device, boolean absolutePath, String[] segments,
- String query, String fragment)
- {
- int hashCode = 0;
- //boolean iri = false;
-
- if (hierarchical)
- {
- ++hashCode;
- }
- if (absolutePath)
- {
- hashCode += 2;
- }
- if (scheme != null)
- {
- hashCode ^= scheme.toLowerCase().hashCode();
- }
- if (authority != null)
- {
- hashCode ^= authority.hashCode();
- //iri = iri || containsNonASCII(authority);
- }
- if (device != null)
- {
- hashCode ^= device.hashCode();
- //iri = iri || containsNonASCII(device);
- }
- if (query != null)
- {
- hashCode ^= query.hashCode();
- //iri = iri || containsNonASCII(query);
- }
- if (fragment != null)
- {
- hashCode ^= fragment.hashCode();
- //iri = iri || containsNonASCII(fragment);
- }
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- hashCode ^= segments[i].hashCode();
- //iri = iri || containsNonASCII(segments[i]);
- }
-
- this.hashCode = hashCode;
- //this.iri = iri;
- this.hierarchical = hierarchical;
- this.scheme = scheme == null ? null : scheme.intern();
- this.authority = authority;
- this.device = device;
- this.absolutePath = absolutePath;
- this.segments = segments;
- this.query = query;
- this.fragment = fragment;
- }
-
- // Validates all of the URI components. Factory methods should call this
- // before using the constructor, though they must ensure that the
- // inter-component requirements described in their own Javadocs are all
- // satisfied, themselves. If a new URI is being constructed out of
- // an existing URI, this need not be called. Instead, just the new
- // components may be validated individually.
- private static void validateURI(boolean hierarchical, String scheme,
- String authority, String device,
- boolean absolutePath, String[] segments,
- String query, String fragment)
- {
- if (!validScheme(scheme))
- {
- throw new IllegalArgumentException("invalid scheme: " + scheme);
- }
- if (!hierarchical && !validOpaquePart(authority))
- {
- throw new IllegalArgumentException("invalid opaquePart: " + authority);
- }
- if (hierarchical && !isArchiveScheme(scheme) && !validAuthority(authority))
- {
- throw new IllegalArgumentException("invalid authority: " + authority);
- }
- if (hierarchical && isArchiveScheme(scheme) && !validArchiveAuthority(authority))
- {
- throw new IllegalArgumentException("invalid authority: " + authority);
- }
- if (!validDevice(device))
- {
- throw new IllegalArgumentException("invalid device: " + device);
- }
- if (!validSegments(segments))
- {
- String s = segments == null ? "invalid segments: " + segments :
- "invalid segment: " + firstInvalidSegment(segments);
- throw new IllegalArgumentException(s);
- }
- if (!validQuery(query))
- {
- throw new IllegalArgumentException("invalid query: " + query);
- }
- if (!validFragment(fragment))
- {
- throw new IllegalArgumentException("invalid fragment: " + fragment);
- }
- }
-
- // Alternate, stricter implementations of the following validation methods
- // are provided, commented out, for possible future use...
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the scheme component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid scheme may be null or contain any characters except for the
- * following: <code>: / ? #</code>
- */
- public static boolean validScheme(String value)
- {
- return value == null || !contains(value, MAJOR_SEPARATOR_HI, MAJOR_SEPARATOR_LO);
-
- // <p>A valid scheme may be null, or consist of a single letter followed
- // by any number of letters, numbers, and the following characters:
- // <code>+ - .</code>
-
- //if (value == null) return true;
- //return value.length() != 0 &&
- // matches(value.charAt(0), ALPHA_HI, ALPHA_LO) &&
- // validate(value, SCHEME_CHAR_HI, SCHEME_CHAR_LO, false, false);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the opaque part component of a URI; <code>false</code>
- * otherwise.
- *
- * <p>A valid opaque part must be non-null, non-empty, and not contain the
- * <code>#</code> character. In addition, its first character must not be
- * <code>/</code>
- */
- public static boolean validOpaquePart(String value)
- {
- return value != null && value.indexOf(FRAGMENT_SEPARATOR) == -1 &&
- value.length() > 0 && value.charAt(0) != SEGMENT_SEPARATOR;
-
- // <p>A valid opaque part must be non-null and non-empty. It may contain
- // any allowed URI characters, but its first character may not be
- // <code>/</code>
-
- //return value != null && value.length() != 0 &&
- // value.charAt(0) != SEGMENT_SEPARATOR &&
- // validate(value, URIC_HI, URIC_LO, true, true);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the authority component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid authority may be null or contain any characters except for
- * the following: <code>/ ? #</code>
- */
- public static boolean validAuthority(String value)
- {
- return value == null || !contains(value, SEGMENT_END_HI, SEGMENT_END_LO);
-
- // A valid authority may be null or contain any allowed URI characters except
- // for the following: <code>/ ?</code>
-
- //return value == null || validate(value, SEGMENT_CHAR_HI, SEGMENT_CHAR_LO, true, true);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the authority component of an <a
- * href="#archive_explanation">archive URI</a>; <code>false</code>
- * otherwise.
- *
- * <p>To be valid, the authority, itself, must be a URI with no fragment,
- * followed by the character <code>!</code>.
- */
- public static boolean validArchiveAuthority(String value)
- {
- if (value != null && value.length() > 0 &&
- value.charAt(value.length() - 1) == ARCHIVE_IDENTIFIER)
- {
- try
- {
- URI archiveURI = createURI(value.substring(0, value.length() - 1));
- return !archiveURI.hasFragment();
- }
- catch (IllegalArgumentException e)
- {
- }
- }
- return false;
- }
-
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the device component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid device may be null or non-empty, containing any characters
- * except for the following: <code>/ ? #</code> In addition, its last
- * character must be <code>:</code>
- */
- public static boolean validDevice(String value)
- {
- if (value == null) return true;
- int len = value.length();
- return len > 0 && value.charAt(len - 1) == DEVICE_IDENTIFIER &&
- !contains(value, SEGMENT_END_HI, SEGMENT_END_LO);
-
- // <p>A valid device may be null or non-empty, containing any allowed URI
- // characters except for the following: <code>/ ?</code> In addition, its
- // last character must be <code>:</code>
-
- //if (value == null) return true;
- //int len = value.length();
- //return len > 0 && validate(value, SEGMENT_CHAR_HI, SEGMENT_CHAR_LO, true, true) &&
- // value.charAt(len - 1) == DEVICE_IDENTIFIER;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * a valid path segment of a URI; <code>false</code> otherwise.
- *
- * <p>A valid path segment must be non-null and not contain any of the
- * following characters: <code>/ ? #</code>
- */
- public static boolean validSegment(String value)
- {
- return value != null && !contains(value, SEGMENT_END_HI, SEGMENT_END_LO);
-
- // <p>A valid path segment must be non-null and may contain any allowed URI
- // characters except for the following: <code>/ ?</code>
-
- //return value != null && validate(value, SEGMENT_CHAR_HI, SEGMENT_CHAR_LO, true, true);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * a valid path segment array of a URI; <code>false</code> otherwise.
- *
- * <p>A valid path segment array must be non-null and contain only path
- * segements that are valid according to {@link #validSegment validSegment}.
- */
- public static boolean validSegments(String[] value)
- {
- if (value == null) return false;
- for (int i = 0, len = value.length; i < len; i++)
- {
- if (!validSegment(value[i])) return false;
- }
- return true;
- }
-
- // Returns null if the specicied value is null or would be a valid path
- // segment array of a URI; otherwise, the value of the first invalid
- // segment.
- private static String firstInvalidSegment(String[] value)
- {
- if (value == null) return null;
- for (int i = 0, len = value.length; i < len; i++)
- {
- if (!validSegment(value[i])) return value[i];
- }
- return null;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the query component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid query may be null or contain any characters except for
- * <code>#</code>
- */
- public static boolean validQuery(String value)
- {
- return value == null || value.indexOf(FRAGMENT_SEPARATOR) == -1;
-
- // <p>A valid query may be null or contain any allowed URI characters.
-
- //return value == null || validate(value, URIC_HI, URIC_LO, true, true);
-}
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the fragment component of a URI; <code>false</code> otherwise.
- *
- * <p>A fragment is taken to be unconditionally valid.
- */
- public static boolean validFragment(String value)
- {
- return true;
-
- // <p>A valid fragment may be null or contain any allowed URI characters.
-
- //return value == null || validate(value, URIC_HI, URIC_LO, true, true);
- }
-
- // Searches the specified string for any characters in the set represnted
- // by the 128-bit bitmask. Returns true if any occur, or false otherwise.
- private static boolean contains(String s, long highBitmask, long lowBitmask)
- {
- for (int i = 0, len = s.length(); i < len; i++)
- {
- if (matches(s.charAt(i), highBitmask, lowBitmask)) return true;
- }
- return false;
- }
-
- // Tests the non-null string value to see if it contains only ASCII
- // characters in the set represented by the specified 128-bit bitmask,
- // as well as, optionally, non-ASCII characters 0xA0 and above, and,
- // also optionally, escape sequences of % followed by two hex digits.
- // This method is used for the new, strict URI validation that is not
- // not currently in place.
-/*
- private static boolean validate(String value, long highBitmask, long lowBitmask,
- boolean allowNonASCII, boolean allowEscaped)
- {
- for (int i = 0, len = value.length(); i < len; i++)
- {
- char c = value.charAt(i);
-
- if (matches(c, highBitmask, lowBitmask)) continue;
- if (allowNonASCII && c >= 160) continue;
- if (allowEscaped && isEscaped(value, i))
- {
- i += 2;
- continue;
- }
- return false;
- }
- return true;
- }
-*/
-
- /**
- * Returns <code>true</code> if this is a relative URI, or
- * <code>false</code> if it is an absolute URI.
- */
- public boolean isRelative()
- {
- return scheme == null;
- }
-
- /**
- * Returns <code>true</code> if this a a hierarchical URI, or
- * <code>false</code> if it is of the generic form.
- */
- public boolean isHierarchical()
- {
- return hierarchical;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarcical URI with an authority
- * component; <code>false</code> otherwise.
- */
- public boolean hasAuthority()
- {
- return hierarchical && authority != null;
- }
-
- /**
- * Returns <code>true</code> if this is a non-hierarchical URI with an
- * opaque part component; <code>false</code> otherwise.
- */
- public boolean hasOpaquePart()
- {
- // note: hierarchical -> authority != null
- return !hierarchical;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a device
- * component; <code>false</code> otherwise.
- */
- public boolean hasDevice()
- {
- // note: device != null -> hierarchical
- return device != null;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an
- * absolute or relative path; <code>false</code> otherwise.
- */
- public boolean hasPath()
- {
- // note: (absolutePath || authority == null) -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return absolutePath || (authority == null && device == null);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an
- * absolute path, or <code>false</code> if it is non-hierarchical, has no
- * path, or has a relative path.
- */
- public boolean hasAbsolutePath()
- {
- // note: absolutePath -> hierarchical
- return absolutePath;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a relative
- * path, or <code>false</code> if it is non-hierarchical, has no path, or
- * has an absolute path.
- */
- public boolean hasRelativePath()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an empty
- * relative path; <code>false</code> otherwise.
- *
- * <p>Note that <code>!hasEmpty()</code> does <em>not</em> imply that this
- * URI has any path segments; however, <code>hasRelativePath &&
- * !hasEmptyPath()</code> does.
- */
- public boolean hasEmptyPath()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a query
- * component; <code>false</code> otherwise.
- */
- public boolean hasQuery()
- {
- // note: query != null -> hierarchical
- return query != null;
- }
-
- /**
- * Returns <code>true</code> if this URI has a fragment component;
- * <code>false</code> otherwise.
- */
- public boolean hasFragment()
- {
- return fragment != null;
- }
-
- /**
- * Returns <code>true</code> if this is a current document reference; that
- * is, if it is a relative hierarchical URI with no authority, device or
- * query components, and no path segments; <code>false</code> is returned
- * otherwise.
- */
- public boolean isCurrentDocumentReference()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0 && query == null;
- }
-
- /**
- * Returns <code>true</code> if this is a {@link
- * #isCurrentDocumentReference() current document reference} with no
- * fragment component; <code>false</code> otherwise.
- *
- * @see #isCurrentDocumentReference()
- */
- public boolean isEmpty()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0 && query == null && fragment == null;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that may refer
- * directly to a locally accessible file. This is considered to be the
- * case for a file-scheme absolute URI, or for a relative URI with no query;
- * <code>false</code> is returned otherwise.
- */
- public boolean isFile()
- {
- return isHierarchical() &&
- ((isRelative() && !hasQuery()) || SCHEME_FILE.equalsIgnoreCase(scheme));
- }
-
- // Returns true if this is an archive URI. If so, we should expect that
- // it is also hierarchical, with an authority (consisting of an absolute
- // URI followed by "!"), no device, and an absolute path.
- private boolean isArchive()
- {
- return isArchiveScheme(scheme);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the scheme of an <a
- * href="#archive_explanation">archive URI</a>; <code>false</code>
- * otherwise.
- */
- public static boolean isArchiveScheme(String value)
- {
- return value != null && archiveSchemes.contains(value.toLowerCase());
- }
-
- /**
- * Returns the hash code.
- */
- public int hashCode()
- {
- return hashCode;
- }
-
- /**
- * Returns <code>true</code> if <code>obj</code> is an instance of
- * <code>URI</code> equal to this one; <code>false</code> otherwise.
- *
- * <p>Equality is determined strictly by comparing components, not by
- * attempting to interpret what resource is being identified. The
- * comparison of schemes is case-insensitive.
- */
- public boolean equals(Object obj)
- {
- if (this == obj) return true;
- if (!(obj instanceof URI)) return false;
- URI uri = (URI) obj;
-
- return hashCode == uri.hashCode() &&
- hierarchical == uri.isHierarchical() &&
- absolutePath == uri.hasAbsolutePath() &&
- equals(scheme, uri.scheme(), true) &&
- equals(authority, hierarchical ? uri.authority() : uri.opaquePart()) &&
- equals(device, uri.device()) &&
- equals(query, uri.query()) &&
- equals(fragment, uri.fragment()) &&
- segmentsEqual(uri);
- }
-
- // Tests whether this URI's path segment array is equal to that of the
- // given uri.
- private boolean segmentsEqual(URI uri)
- {
- if (segments.length != uri.segmentCount()) return false;
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (!segments[i].equals(uri.segment(i))) return false;
- }
- return true;
- }
-
- // Tests two objects for equality, tolerating nulls; null is considered
- // to be a valid value that is only equal to itself.
- private static boolean equals(Object o1, Object o2)
- {
- return o1 == null ? o2 == null : o1.equals(o2);
- }
-
- // Tests two strings for equality, tolerating nulls and optionally
- // ignoring case.
- private static boolean equals(String s1, String s2, boolean ignoreCase)
- {
- return s1 == null ? s2 == null :
- ignoreCase ? s1.equalsIgnoreCase(s2) : s1.equals(s2);
- }
-
- /**
- * If this is an absolute URI, returns the scheme component;
- * <code>null</code> otherwise.
- */
- public String scheme()
- {
- return scheme;
- }
-
- /**
- * If this is a non-hierarchical URI, returns the opaque part component;
- * <code>null</code> otherwise.
- */
- public String opaquePart()
- {
- return isHierarchical() ? null : authority;
- }
-
- /**
- * If this is a hierarchical URI with an authority component, returns it;
- * <code>null</code> otherwise.
- */
- public String authority()
- {
- return isHierarchical() ? authority : null;
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * user info portion, returns it; <code>null</code> otherwise.
- */
- public String userInfo()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(USER_INFO_SEPARATOR);
- return i < 0 ? null : authority.substring(0, i);
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * host portion, returns it; <code>null</code> otherwise.
- */
- public String host()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(USER_INFO_SEPARATOR);
- int j = authority.indexOf(PORT_SEPARATOR);
- return j < 0 ? authority.substring(i + 1) : authority.substring(i + 1, j);
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * port portion, returns it; <code>null</code> otherwise.
- */
- public String port()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(PORT_SEPARATOR);
- return i < 0 ? null : authority.substring(i + 1);
- }
-
- /**
- * If this is a hierarchical URI with a device component, returns it;
- * <code>null</code> otherwise.
- */
- public String device()
- {
- return device;
- }
-
- /**
- * If this is a hierarchical URI with a path, returns an array containing
- * the segments of the path; an empty array otherwise. The leading
- * separator in an absolute path is not represented in this array, but a
- * trailing separator is represented by an empty-string segment as the
- * final element.
- */
- public String[] segments()
- {
- return (String[])segments.clone();
- }
-
- /**
- * Returns an unmodifiable list containing the same segments as the array
- * returned by {@link #segments segments}.
- */
- public List segmentsList()
- {
- return Collections.unmodifiableList(Arrays.asList(segments));
- }
-
- /**
- * Returns the number of elements in the segment array that would be
- * returned by {@link #segments segments}.
- */
- public int segmentCount()
- {
- return segments.length;
- }
-
- /**
- * Provides fast, indexed access to individual segments in the path
- * segment array.
- *
- * @exception java.lang.IndexOutOfBoundsException if <code>i < 0</code> or
- * <code>i >= segmentCount()</code>.
- */
- public String segment(int i)
- {
- return segments[i];
- }
-
- /**
- * Returns the last segment in the segment array, or <code>null</code>.
- */
- public String lastSegment()
- {
- int len = segments.length;
- if (len == 0) return null;
- return segments[len - 1];
- }
-
- /**
- * If this is a hierarchical URI with a path, returns a string
- * representation of the path; <code>null</code> otherwise. The path
- * consists of a leading segment separator character (a slash), if the
- * path is absolute, followed by the slash-separated path segments. If
- * this URI has a separate <a href="#device_explanation">device
- * component</a>, it is <em>not</em> included in the path.
- */
- public String path()
- {
- if (!hasPath()) return null;
-
- StringBuffer result = new StringBuffer();
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
- return result.toString();
- }
-
- /**
- * If this is a hierarchical URI with a path, returns a string
- * representation of the path, including the authority and the
- * <a href="#device_explanation">device component</a>;
- * <code>null</code> otherwise.
- *
- * <p>If there is no authority, the format of this string is:
- * <pre>
- * device/pathSegment1/pathSegment2...</pre>
- *
- * <p>If there is an authority, it is:
- * <pre>
- * //authority/device/pathSegment1/pathSegment2...</pre>
- *
- * <p>For an <a href="#archive_explanation">archive URI</a>, it's just:
- * <pre>
- * authority/pathSegment1/pathSegment2...</pre>
- */
- public String devicePath()
- {
- if (!hasPath()) return null;
-
- StringBuffer result = new StringBuffer();
-
- if (hasAuthority())
- {
- if (!isArchive()) result.append(AUTHORITY_SEPARATOR);
- result.append(authority);
-
- if (hasDevice()) result.append(SEGMENT_SEPARATOR);
- }
-
- if (hasDevice()) result.append(device);
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
- return result.toString();
- }
-
- /**
- * If this is a hierarchical URI with a query component, returns it;
- * <code>null</code> otherwise.
- */
- public String query()
- {
- return query;
- }
-
-
- /**
- * Returns the URI formed from this URI and the given query.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>query</code> is not a valid query (portion) according
- * to {@link #validQuery validQuery}.
- */
- public URI appendQuery(String query)
- {
- if (!validQuery(query))
- {
- throw new IllegalArgumentException(
- "invalid query portion: " + query);
- }
- return new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
- }
-
- /**
- * If this URI has a non-null {@link #query query}, returns the URI
- * formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimQuery()
- {
- if (query == null)
- {
- return this;
- }
- else
- {
- return new URI(hierarchical, scheme, authority, device, absolutePath, segments, null, fragment);
- }
- }
-
- /**
- * If this URI has a fragment component, returns it; <code>null</code>
- * otherwise.
- */
- public String fragment()
- {
- return fragment;
- }
-
- /**
- * Returns the URI formed from this URI and the given fragment.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>fragment</code> is not a valid fragment (portion) according
- * to {@link #validFragment validFragment}.
- */
- public URI appendFragment(String fragment)
- {
- if (!validFragment(fragment))
- {
- throw new IllegalArgumentException(
- "invalid fragment portion: " + fragment);
- }
- URI result = new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
-
- if (!hasFragment())
- {
- result.cachedTrimFragment = this;
- }
- return result;
- }
-
- /**
- * If this URI has a non-null {@link #fragment fragment}, returns the URI
- * formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimFragment()
- {
- if (fragment == null)
- {
- return this;
- }
- else if (cachedTrimFragment == null)
- {
- cachedTrimFragment = new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, null);
- }
-
- return cachedTrimFragment;
- }
-
- /**
- * Resolves this URI reference against a <code>base</code> absolute
- * hierarchical URI, returning the resulting absolute URI. If already
- * absolute, the URI itself is returned. URI resolution is described in
- * detail in section 5.2 of <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC
- * 2396</a>, "Resolving Relative References to Absolute Form."
- *
- * <p>During resolution, empty segments, self references ("."), and parent
- * references ("..") are interpreted, so that they can be removed from the
- * path. Step 6(g) gives a choice of how to handle the case where parent
- * references point to a path above the root: the offending segments can
- * be preserved or discarded. This method preserves them. To have them
- * discarded, please use the two-parameter form of {@link
- * #resolve(URI, boolean) resolve}.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- */
- public URI resolve(URI base)
- {
- return resolve(base, true);
- }
-
- /**
- * Resolves this URI reference against a <code>base</code> absolute
- * hierarchical URI, returning the resulting absolute URI. If already
- * absolute, the URI itself is returned. URI resolution is described in
- * detail in section 5.2 of <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC
- * 2396</a>, "Resolving Relative References to Absolute Form."
- *
- * <p>During resultion, empty segments, self references ("."), and parent
- * references ("..") are interpreted, so that they can be removed from the
- * path. Step 6(g) gives a choice of how to handle the case where parent
- * references point to a path above the root: the offending segments can
- * be preserved or discarded. This method can do either.
- *
- * @param preserveRootParents <code>true</code> if segments refering to the
- * parent of the root path are to be preserved; <code>false</code> if they
- * are to be discarded.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- */
- public URI resolve(URI base, boolean preserveRootParents)
- {
- if (!base.isHierarchical() || base.isRelative())
- {
- throw new IllegalArgumentException(
- "resolve against non-hierarchical or relative base");
- }
-
- // an absolute URI needs no resolving
- if (!isRelative()) return this;
-
- // note: isRelative() -> hierarchical
-
- String newAuthority = authority;
- String newDevice = device;
- boolean newAbsolutePath = absolutePath;
- String[] newSegments = segments;
- String newQuery = query;
- // note: it's okay for two URIs to share a segments array, since
- // neither will ever modify it
-
- if (authority == null)
- {
- // no authority: use base's
- newAuthority = base.authority();
-
- if (device == null)
- {
- // no device: use base's
- newDevice = base.device();
-
- if (hasEmptyPath() && query == null)
- {
- // current document reference: use base path and query
- newAbsolutePath = base.hasAbsolutePath();
- newSegments = base.segments();
- newQuery = base.query();
- }
- else if (hasRelativePath())
- {
- // relative path: merge with base and keep query (note: if the
- // base has no path and this a non-empty relative path, there is
- // an implied root in the resulting path)
- newAbsolutePath = base.hasAbsolutePath() || !hasEmptyPath();
- newSegments = newAbsolutePath ? mergePath(base, preserveRootParents)
- : NO_SEGMENTS;
- }
- // else absolute path: keep it and query
- }
- // else keep device, path, and query
- }
- // else keep authority, device, path, and query
-
- // always keep fragment, even if null, and use scheme from base;
- // no validation needed since all components are from existing URIs
- return new URI(true, base.scheme(), newAuthority, newDevice,
- newAbsolutePath, newSegments, newQuery, fragment);
- }
-
- // Merges this URI's relative path with the base non-relative path. If
- // base has no path, treat it as the root absolute path, unless this has
- // no path either.
- private String[] mergePath(URI base, boolean preserveRootParents)
- {
- if (base.hasRelativePath())
- {
- throw new IllegalArgumentException("merge against relative path");
- }
- if (!hasRelativePath())
- {
- throw new IllegalStateException("merge non-relative path");
- }
-
- int baseSegmentCount = base.segmentCount();
- int segmentCount = segments.length;
- String[] stack = new String[baseSegmentCount + segmentCount];
- int sp = 0;
-
- // use a stack to accumulate segments of base, except for the last
- // (i.e. skip trailing separator and anything following it), and of
- // relative path
- for (int i = 0; i < baseSegmentCount - 1; i++)
- {
- sp = accumulate(stack, sp, base.segment(i), preserveRootParents);
- }
-
- for (int i = 0; i < segmentCount; i++)
- {
- sp = accumulate(stack, sp, segments[i], preserveRootParents);
- }
-
- // if the relative path is empty or ends in an empty segment, a parent
- // reference, or a self referenfce, add a trailing separator to a
- // non-empty path
- if (sp > 0 && (segmentCount == 0 ||
- SEGMENT_EMPTY.equals(segments[segmentCount - 1]) ||
- SEGMENT_PARENT.equals(segments[segmentCount - 1]) ||
- SEGMENT_SELF.equals(segments[segmentCount - 1])))
- {
- stack[sp++] = SEGMENT_EMPTY;
- }
-
- // return a correctly sized result
- String[] result = new String[sp];
- System.arraycopy(stack, 0, result, 0, sp);
- return result;
- }
-
- // Adds a segment to a stack, skipping empty segments and self references,
- // and interpreting parent references.
- private static int accumulate(String[] stack, int sp, String segment,
- boolean preserveRootParents)
- {
- if (SEGMENT_PARENT.equals(segment))
- {
- if (sp == 0)
- {
- // special care must be taken for a root's parent reference: it is
- // either ignored or the symbolic reference itself is pushed
- if (preserveRootParents) stack[sp++] = segment;
- }
- else
- {
- // unless we're already accumulating root parent references,
- // parent references simply pop the last segment descended
- if (SEGMENT_PARENT.equals(stack[sp - 1])) stack[sp++] = segment;
- else sp--;
- }
- }
- else if (!SEGMENT_EMPTY.equals(segment) && !SEGMENT_SELF.equals(segment))
- {
- // skip empty segments and self references; push everything else
- stack[sp++] = segment;
- }
- return sp;
- }
-
- /**
- * Finds the shortest relative or, if necessary, the absolute URI that,
- * when resolved against the given <code>base</code> absolute hierarchical
- * URI using {@link #resolve(URI) resolve}, will yield this absolute URI.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- * @exception java.lang.IllegalStateException if <code>this</code> is
- * relative.
- */
- public URI deresolve(URI base)
- {
- return deresolve(base, true, false, true);
- }
-
- /**
- * Finds an absolute URI that, when resolved against the given
- * <code>base</code> absolute hierarchical URI using {@link
- * #resolve(URI, boolean) resolve}, will yield this absolute URI.
- *
- * @param preserveRootParents the boolean argument to <code>resolve(URI,
- * boolean)</code> for which the returned URI should resolve to this URI.
- * @param anyRelPath if <code>true</code>, the returned URI's path (if
- * any) will be relative, if possible. If <code>false</code>, the form of
- * the result's path will depend upon the next parameter.
- * @param shorterRelPath if <code>anyRelPath</code> is <code>false</code>
- * and this parameter is <code>true</code>, the returned URI's path (if
- * any) will be relative, if one can be found that is no longer (by number
- * of segments) than the absolute path. If both <code>anyRelPath</code>
- * and this parameter are <code>false</code>, it will be absolute.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- * @exception java.lang.IllegalStateException if <code>this</code> is
- * relative.
- */
- public URI deresolve(URI base, boolean preserveRootParents,
- boolean anyRelPath, boolean shorterRelPath)
- {
- if (!base.isHierarchical() || base.isRelative())
- {
- throw new IllegalArgumentException(
- "deresolve against non-hierarchical or relative base");
- }
- if (isRelative())
- {
- throw new IllegalStateException("deresolve relative URI");
- }
-
- // note: these assertions imply that neither this nor the base URI has a
- // relative path; thus, both have either an absolute path or no path
-
- // different scheme: need complete, absolute URI
- if (!scheme.equalsIgnoreCase(base.scheme())) return this;
-
- // since base must be hierarchical, and since a non-hierarchical URI
- // must have both scheme and opaque part, the complete absolute URI is
- // needed to resolve to a non-hierarchical URI
- if (!isHierarchical()) return this;
-
- String newAuthority = authority;
- String newDevice = device;
- boolean newAbsolutePath = absolutePath;
- String[] newSegments = segments;
- String newQuery = query;
-
- if (equals(authority, base.authority()) &&
- (hasDevice() || hasPath() || (!base.hasDevice() && !base.hasPath())))
- {
- // matching authorities and no device or path removal
- newAuthority = null;
-
- if (equals(device, base.device()) && (hasPath() || !base.hasPath()))
- {
- // matching devices and no path removal
- newDevice = null;
-
- // exception if (!hasPath() && base.hasPath())
-
- if (!anyRelPath && !shorterRelPath)
- {
- // user rejects a relative path: keep absolute or no path
- }
- else if (hasPath() == base.hasPath() && segmentsEqual(base) &&
- equals(query, base.query()))
- {
- // current document reference: keep no path or query
- newAbsolutePath = false;
- newSegments = NO_SEGMENTS;
- newQuery = null;
- }
- else if (!hasPath() && !base.hasPath())
- {
- // no paths: keep query only
- newAbsolutePath = false;
- newSegments = NO_SEGMENTS;
- }
- // exception if (!hasAbsolutePath())
- else if (hasCollapsableSegments(preserveRootParents))
- {
- // path form demands an absolute path: keep it and query
- }
- else
- {
- // keep query and select relative or absolute path based on length
- String[] rel = findRelativePath(base, preserveRootParents);
- if (anyRelPath || segments.length > rel.length)
- {
- // user demands a relative path or the absolute path is longer
- newAbsolutePath = false;
- newSegments = rel;
- }
- // else keep shorter absolute path
- }
- }
- // else keep device, path, and query
- }
- // else keep authority, device, path, and query
-
- // always include fragment, even if null;
- // no validation needed since all components are from existing URIs
- return new URI(true, null, newAuthority, newDevice, newAbsolutePath,
- newSegments, newQuery, fragment);
- }
-
- // Returns true if the non-relative path includes segments that would be
- // collapsed when resolving; false otherwise. If preserveRootParents is
- // true, collapsable segments include any empty segments, except for the
- // last segment, as well as and parent and self references. If
- // preserveRootsParents is false, parent references are not collapsable if
- // they are the first segment or preceeded only by other parent
- // references.
- private boolean hasCollapsableSegments(boolean preserveRootParents)
- {
- if (hasRelativePath())
- {
- throw new IllegalStateException("test collapsability of relative path");
- }
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- String segment = segments[i];
- if ((i < len - 1 && SEGMENT_EMPTY.equals(segment)) ||
- SEGMENT_SELF.equals(segment) ||
- SEGMENT_PARENT.equals(segment) && (
- !preserveRootParents || (
- i != 0 && !SEGMENT_PARENT.equals(segments[i - 1]))))
- {
- return true;
- }
- }
- return false;
- }
-
- // Returns the shortest relative path between the the non-relative path of
- // the given base and this absolute path. If the base has no path, it is
- // treated as the root absolute path.
- private String[] findRelativePath(URI base, boolean preserveRootParents)
- {
- if (base.hasRelativePath())
- {
- throw new IllegalArgumentException(
- "find relative path against base with relative path");
- }
- if (!hasAbsolutePath())
- {
- throw new IllegalArgumentException(
- "find relative path of non-absolute path");
- }
-
- // treat an empty base path as the root absolute path
- String[] startPath = base.collapseSegments(preserveRootParents);
- String[] endPath = segments;
-
- // drop last segment from base, as in resolving
- int startCount = startPath.length > 0 ? startPath.length - 1 : 0;
- int endCount = endPath.length;
-
- // index of first segment that is different between endPath and startPath
- int diff = 0;
-
- // if endPath is shorter than startPath, the last segment of endPath may
- // not be compared: because startPath has been collapsed and had its
- // last segment removed, all preceeding segments can be considered non-
- // empty and followed by a separator, while the last segment of endPath
- // will either be non-empty and not followed by a separator, or just empty
- for (int count = startCount < endCount ? startCount : endCount - 1;
- diff < count && startPath[diff].equals(endPath[diff]); diff++);
-
- int upCount = startCount - diff;
- int downCount = endCount - diff;
-
- // a single separator, possibly preceeded by some parent reference
- // segments, is redundant
- if (downCount == 1 && SEGMENT_EMPTY.equals(endPath[endCount - 1]))
- {
- downCount = 0;
- }
-
- // an empty path needs to be replaced by a single "." if there is no
- // query, to distinguish it from a current document reference
- if (upCount + downCount == 0)
- {
- if (query == null) return new String[] { SEGMENT_SELF };
- return NO_SEGMENTS;
- }
-
- // return a correctly sized result
- String[] result = new String[upCount + downCount];
- Arrays.fill(result, 0, upCount, SEGMENT_PARENT);
- System.arraycopy(endPath, diff, result, upCount, downCount);
- return result;
- }
-
- // Collapses non-ending empty segments, parent references, and self
- // references in a non-relative path, returning the same path that would
- // be produced from the base hierarchical URI as part of a resolve.
- String[] collapseSegments(boolean preserveRootParents)
- {
- if (hasRelativePath())
- {
- throw new IllegalStateException("collapse relative path");
- }
-
- if (!hasCollapsableSegments(preserveRootParents)) return segments();
-
- // use a stack to accumulate segments
- int segmentCount = segments.length;
- String[] stack = new String[segmentCount];
- int sp = 0;
-
- for (int i = 0; i < segmentCount; i++)
- {
- sp = accumulate(stack, sp, segments[i], preserveRootParents);
- }
-
- // if the path is non-empty and originally ended in an empty segment, a
- // parent reference, or a self reference, add a trailing separator
- if (sp > 0 && (SEGMENT_EMPTY.equals(segments[segmentCount - 1]) ||
- SEGMENT_PARENT.equals(segments[segmentCount - 1]) ||
- SEGMENT_SELF.equals(segments[segmentCount - 1])))
- {
- stack[sp++] = SEGMENT_EMPTY;
- }
-
- // return a correctly sized result
- String[] result = new String[sp];
- System.arraycopy(stack, 0, result, 0, sp);
- return result;
- }
-
- /**
- * Returns the string representation of this URI. For a generic,
- * non-hierarchical URI, this looks like:
- * <pre>
- * scheme:opaquePart#fragment</pre>
- *
- * <p>For a hierarchical URI, it looks like:
- * <pre>
- * scheme://authority/device/pathSegment1/pathSegment2...?query#fragment</pre>
- *
- * <p>For an <a href="#archive_explanation">archive URI</a>, it's just:
- * <pre>
- * scheme:authority/pathSegment1/pathSegment2...?query#fragment</pre>
- * <p>Of course, absent components and their separators will be omitted.
- */
- public String toString()
- {
- if (cachedToString == null)
- {
- StringBuffer result = new StringBuffer();
- if (!isRelative())
- {
- result.append(scheme);
- result.append(SCHEME_SEPARATOR);
- }
-
- if (isHierarchical())
- {
- if (hasAuthority())
- {
- if (!isArchive()) result.append(AUTHORITY_SEPARATOR);
- result.append(authority);
- }
-
- if (hasDevice())
- {
- result.append(SEGMENT_SEPARATOR);
- result.append(device);
- }
-
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
-
- if (hasQuery())
- {
- result.append(QUERY_SEPARATOR);
- result.append(query);
- }
- }
- else
- {
- result.append(authority);
- }
-
- if (hasFragment())
- {
- result.append(FRAGMENT_SEPARATOR);
- result.append(fragment);
- }
- cachedToString = result.toString();
- }
- return cachedToString;
- }
-
- // Returns a string representation of this URI for debugging, explicitly
- // showing each of the components.
- String toString(boolean includeSimpleForm)
- {
- StringBuffer result = new StringBuffer();
- if (includeSimpleForm) result.append(toString());
- result.append("\n hierarchical: ");
- result.append(hierarchical);
- result.append("\n scheme: ");
- result.append(scheme);
- result.append("\n authority: ");
- result.append(authority);
- result.append("\n device: ");
- result.append(device);
- result.append("\n absolutePath: ");
- result.append(absolutePath);
- result.append("\n segments: ");
- if (segments.length == 0) result.append("<empty>");
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i > 0) result.append("\n ");
- result.append(segments[i]);
- }
- result.append("\n query: ");
- result.append(query);
- result.append("\n fragment: ");
- result.append(fragment);
- return result.toString();
- }
-
- /**
- * If this URI may refer directly to a locally accessible file, as
- * determined by {@link #isFile isFile}, {@link decode decodes} and formats
- * the URI as a pathname to that file; returns null otherwise.
- *
- * <p>If there is no authority, the format of this string is:
- * <pre>
- * device/pathSegment1/pathSegment2...</pre>
- *
- * <p>If there is an authority, it is:
- * <pre>
- * //authority/device/pathSegment1/pathSegment2...</pre>
- *
- * <p>However, the character used as a separator is system-dependant and
- * obtained from {@link java.io.File#separatorChar}.
- */
- public String toFileString()
- {
- if (!isFile()) return null;
-
- StringBuffer result = new StringBuffer();
- char separator = File.separatorChar;
-
- if (hasAuthority())
- {
- result.append(separator);
- result.append(separator);
- result.append(authority);
-
- if (hasDevice()) result.append(separator);
- }
-
- if (hasDevice()) result.append(device);
- if (hasAbsolutePath()) result.append(separator);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(separator);
- result.append(segments[i]);
- }
-
- return decode(result.toString());
- }
-
- /**
- * Returns the URI formed by appending the specified segment on to the end
- * of the path of this URI, if hierarchical; this URI unchanged,
- * otherwise. If this URI has an authority and/or device, but no path,
- * the segment becomes the first under the root in an absolute path.
- *
- * @exception java.lang.IllegalArgumentException if <code>segment</code>
- * is not a valid segment according to {@link #validSegment}.
- */
- public URI appendSegment(String segment)
- {
- if (!validSegment(segment))
- {
- throw new IllegalArgumentException("invalid segment: " + segment);
- }
-
- if (!isHierarchical()) return this;
-
- // absolute path or no path -> absolute path
- boolean newAbsolutePath = !hasRelativePath();
-
- int len = segments.length;
- String[] newSegments = new String[len + 1];
- System.arraycopy(segments, 0, newSegments, 0, len);
- newSegments[len] = segment;
-
- return new URI(true, scheme, authority, device, newAbsolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns the URI formed by appending the specified segments on to the
- * end of the path of this URI, if hierarchical; this URI unchanged,
- * otherwise. If this URI has an authority and/or device, but no path,
- * the segments are made to form an absolute path.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. If desired, a trailing separator should be
- * represented by an empty-string segment as the last element of the
- * array.
- *
- * @exception java.lang.IllegalArgumentException if <code>segments</code>
- * is not a valid segment array according to {@link #validSegments}.
- */
- public URI appendSegments(String[] segments)
- {
- if (!validSegments(segments))
- {
- String s = segments == null ? "invalid segments: " + segments :
- "invalid segment: " + firstInvalidSegment(segments);
- throw new IllegalArgumentException(s);
- }
-
- if (!isHierarchical()) return this;
-
- // absolute path or no path -> absolute path
- boolean newAbsolutePath = !hasRelativePath();
-
- int len = this.segments.length;
- int segmentsCount = segments.length;
- String[] newSegments = new String[len + segmentsCount];
- System.arraycopy(this.segments, 0, newSegments, 0, len);
- System.arraycopy(segments, 0, newSegments, len, segmentsCount);
-
- return new URI(true, scheme, authority, device, newAbsolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns the URI formed by trimming the specified number of segments
- * (including empty segments, such as one representing a trailing
- * separator) from the end of the path of this URI, if hierarchical;
- * otherwise, this URI is returned unchanged.
- *
- * <p>Note that if all segments are trimmed from an absolute path, the
- * root absolute path remains.
- *
- * @param i the number of segments to be trimmed in the returned URI. If
- * less than 1, this URI is returned unchanged; if equal to or greater
- * than the number of segments in this URI's path, all segments are
- * trimmed.
- */
- public URI trimSegments(int i)
- {
- if (!isHierarchical() || i < 1) return this;
-
- String[] newSegments = NO_SEGMENTS;
- int len = segments.length - i;
- if (len > 0)
- {
- newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len);
- }
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that has a path
- * that ends with a trailing separator; <code>false</code> otherwise.
- *
- * <p>A trailing separator is represented as an empty segment as the
- * last segment in the path; note that this definition does <em>not</em>
- * include the lone separator in the root absolute path.
- */
- public boolean hasTrailingPathSeparator()
- {
- return segments.length > 0 &&
- SEGMENT_EMPTY.equals(segments[segments.length - 1]);
- }
-
- /**
- * If this is a hierarchical URI whose path includes a file extension,
- * that file extension is returned; null otherwise. We define a file
- * extension as any string following the last period (".") in the final
- * path segment. If there is no path, the path ends in a trailing
- * separator, or the final segment contains no period, then we consider
- * there to be no file extension. If the final segment ends in a period,
- * then the file extension is an empty string.
- */
- public String fileExtension()
- {
- int len = segments.length;
- if (len == 0) return null;
-
- String lastSegment = segments[len - 1];
- int i = lastSegment.lastIndexOf(FILE_EXTENSION_SEPARATOR);
- return i < 0 ? null : lastSegment.substring(i + 1);
- }
-
- /**
- * Returns the URI formed by appending a period (".") followed by the
- * specified file extension to the last path segment of this URI, if it is
- * hierarchical with a non-empty path ending in a non-empty segment;
- * otherwise, this URI is returned unchanged.
-
- * <p>The extension is appended regardless of whether the segment already
- * contains an extension.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>fileExtension</code> is not a valid segment (portion) according
- * to {@link #validSegment}.
- */
- public URI appendFileExtension(String fileExtension)
- {
- if (!validSegment(fileExtension))
- {
- throw new IllegalArgumentException(
- "invalid segment portion: " + fileExtension);
- }
-
- int len = segments.length;
- if (len == 0) return this;
-
- String lastSegment = segments[len - 1];
- if (SEGMENT_EMPTY.equals(lastSegment)) return this;
- StringBuffer newLastSegment = new StringBuffer(lastSegment);
- newLastSegment.append(FILE_EXTENSION_SEPARATOR);
- newLastSegment.append(fileExtension);
-
- String[] newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len - 1);
- newSegments[len - 1] = newLastSegment.toString();
-
- // note: segments.length > 0 -> hierarchical
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * If this URI has a non-null {@link #fileExtension fileExtension},
- * returns the URI formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimFileExtension()
- {
- int len = segments.length;
- if (len == 0) return this;
-
- String lastSegment = segments[len - 1];
- int i = lastSegment.lastIndexOf(FILE_EXTENSION_SEPARATOR);
- if (i < 0) return this;
-
- String newLastSegment = lastSegment.substring(0, i);
- String[] newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len - 1);
- newSegments[len - 1] = newLastSegment;
-
- // note: segments.length > 0 -> hierarchical
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that ends in a
- * slash; that is, it has a trailing path separator or is the root
- * absolute path, and has no query and no fragment; <code>false</code>
- * is returned otherwise.
- */
- public boolean isPrefix()
- {
- return hierarchical && query == null && fragment == null &&
- (hasTrailingPathSeparator() || (absolutePath && segments.length == 0));
- }
-
- /**
- * If this is a hierarchical URI reference and <code>oldPrefix</code> is a
- * prefix of it, this returns the URI formed by replacing it by
- * <code>newPrefix</code>; <code>null</code> otherwise.
- *
- * <p>In order to be a prefix, the <code>oldPrefix</code>'s
- * {@link #isPrefix isPrefix} must return <code>true</code>, and it must
- * match this URI's scheme, authority, and device. Also, the paths must
- * match, up to prefix's end.
- *
- * @exception java.lang.IllegalArgumentException if either
- * <code>oldPrefix</code> or <code>newPrefix</code> is not a prefix URI
- * according to {@link #isPrefix}.
- */
- public URI replacePrefix(URI oldPrefix, URI newPrefix)
- {
- if (!oldPrefix.isPrefix() || !newPrefix.isPrefix())
- {
- String which = oldPrefix.isPrefix() ? "new" : "old";
- throw new IllegalArgumentException("non-prefix " + which + " value");
- }
-
- // Get what's left of the segments after trimming the prefix.
- String[] tailSegments = getTailSegments(oldPrefix);
- if (tailSegments == null) return null;
-
- // If the new prefix has segments, it is not the root absolute path,
- // and we need to drop the trailing empty segment and append the tail
- // segments.
- String[] mergedSegments = tailSegments;
- if (newPrefix.segmentCount() != 0)
- {
- int segmentsToKeep = newPrefix.segmentCount() - 1;
- mergedSegments = new String[segmentsToKeep + tailSegments.length];
- System.arraycopy(newPrefix.segments(), 0, mergedSegments, 0,
- segmentsToKeep);
-
- if (tailSegments.length != 0)
- {
- System.arraycopy(tailSegments, 0, mergedSegments, segmentsToKeep,
- tailSegments.length);
- }
- }
-
- // no validation needed since all components are from existing URIs
- return new URI(true, newPrefix.scheme(), newPrefix.authority(),
- newPrefix.device(), newPrefix.hasAbsolutePath(),
- mergedSegments, query, fragment);
- }
-
- // If this is a hierarchical URI reference and prefix is a prefix of it,
- // returns the portion of the path remaining after that prefix has been
- // trimmed; null otherwise.
- private String[] getTailSegments(URI prefix)
- {
- if (!prefix.isPrefix())
- {
- throw new IllegalArgumentException("non-prefix trim");
- }
-
- // Don't even consider it unless this is hierarchical and has scheme,
- // authority, device and path absoluteness equal to those of the prefix.
- if (!hierarchical ||
- !equals(scheme, prefix.scheme(), true) ||
- !equals(authority, prefix.authority()) ||
- !equals(device, prefix.device()) ||
- absolutePath != prefix.hasAbsolutePath())
- {
- return null;
- }
-
- // If the prefix has no segments, then it is the root absolute path, and
- // we know this is an absolute path, too.
- if (prefix.segmentCount() == 0) return segments;
-
- // This must have no fewer segments than the prefix. Since the prefix
- // is not the root absolute path, its last segment is empty; all others
- // must match.
- int i = 0;
- int segmentsToCompare = prefix.segmentCount() - 1;
- if (segments.length <= segmentsToCompare) return null;
-
- for (; i < segmentsToCompare; i++)
- {
- if (!segments[i].equals(prefix.segment(i))) return null;
- }
-
- // The prefix really is a prefix of this. If this has just one more,
- // empty segment, the paths are the same.
- if (i == segments.length - 1 && SEGMENT_EMPTY.equals(segments[i]))
- {
- return NO_SEGMENTS;
- }
-
- // Otherwise, the path needs only the remaining segments.
- String[] newSegments = new String[segments.length - i];
- System.arraycopy(segments, i, newSegments, 0, newSegments.length);
- return newSegments;
- }
-
- /**
- * Encodes a string so as to produce a valid opaque part value, as defined
- * by the RFC. All excluded characters, such as space and <code>#</code>,
- * are escaped, as is <code>/</code> if it is the first character.
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- */
- public static String encodeOpaquePart(String value, boolean ignoreEscaped)
- {
- String result = encode(value, URIC_HI, URIC_LO, ignoreEscaped);
- return result != null && result.length() > 0 && result.charAt(0) == SEGMENT_SEPARATOR ?
- "%2F" + result.substring(1) :
- result;
- }
-
- /**
- * Encodes a string so as to produce a valid authority, as defined by the
- * RFC. All excluded characters, such as space and <code>#</code>,
- * are escaped, as are <code>/</code> and <code>?</code>
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- */
- public static String encodeAuthority(String value, boolean ignoreEscaped)
- {
- return encode(value, SEGMENT_CHAR_HI, SEGMENT_CHAR_LO, ignoreEscaped);
- }
-
- /**
- * Encodes a string so as to produce a valid segment, as defined by the
- * RFC. All excluded characters, such as space and <code>#</code>,
- * are escaped, as are <code>/</code> and <code>?</code>
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- */
- public static String encodeSegment(String value, boolean ignoreEscaped)
- {
- return encode(value, SEGMENT_CHAR_HI, SEGMENT_CHAR_LO, ignoreEscaped);
- }
-
- /**
- * Encodes a string so as to produce a valid query, as defined by the RFC.
- * Only excluded characters, such as space and <code>#</code>, are escaped.
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- */
- public static String encodeQuery(String value, boolean ignoreEscaped)
- {
- return encode(value, URIC_HI, URIC_LO, ignoreEscaped);
- }
-
- /**
- * Encodes a string so as to produce a valid fragment, as defined by the
- * RFC. Only excluded characters, such as space and <code>#</code>, are
- * escaped.
- *
- * @param ignoreEscaped <code>true</code> to leave <code>%</code> characters
- * unescaped if they already begin a valid three-character escape sequence;
- * <code>false</code> to encode all <code>%</code> characters. Note that
- * if a <code>%</code> is not followed by 2 hex digits, it will always be
- * escaped.
- */
- public static String encodeFragment(String value, boolean ignoreEscaped)
- {
- return encode(value, URIC_HI, URIC_LO, ignoreEscaped);
- }
-
- // Encodes a complete URI, optionally leaving % characters unescaped when
- // beginning a valid three-character escape sequence. We assume that the
- // last # begins the fragment.
- private static String encodeURI(String uri, boolean ignoreEscaped)
- {
- if (uri == null) return null;
-
- StringBuffer result = new StringBuffer();
-
- int i = uri.indexOf(SCHEME_SEPARATOR);
- if (i != -1)
- {
- String scheme = uri.substring(0, i);
- result.append(scheme);
- result.append(SCHEME_SEPARATOR);
- }
-
- int j = uri.lastIndexOf(FRAGMENT_SEPARATOR);
- if (j != -1)
- {
- String sspart = uri.substring(++i, j);
- result.append(encode(sspart, URIC_HI, URIC_LO, ignoreEscaped));
- result.append(FRAGMENT_SEPARATOR);
-
- String fragment = uri.substring(++j);
- result.append(encode(fragment, URIC_HI, URIC_LO, ignoreEscaped));
- }
- else
- {
- String sspart = uri.substring(++i);
- result.append(encode(sspart, URIC_HI, URIC_LO, ignoreEscaped));
- }
-
- return result.toString();
- }
-
- // Encodes the given string, replacing each ASCII character that is not in
- // the set specified by the 128-bit bitmask and each non-ASCII character
- // below 0xA0 by an escape sequence of % followed by two hex digits. If
- // % is not in the set but ignoreEscaped is true, then % will not be encoded
- // iff it already begins a valid escape sequence.
- private static String encode(String value, long highBitmask, long lowBitmask, boolean ignoreEscaped)
- {
- if (value == null) return null;
-
- StringBuffer result = null;
-
- for (int i = 0, len = value.length(); i < len; i++)
- {
- char c = value.charAt(i);
-
- if (!matches(c, highBitmask, lowBitmask) && c < 160 &&
- (!ignoreEscaped || !isEscaped(value, i)))
- {
- if (result == null)
- {
- result = new StringBuffer(value.substring(0, i));
- }
- appendEscaped(result, (byte)c);
- }
- else if (result != null)
- {
- result.append(c);
- }
- }
- return result == null ? value : result.toString();
- }
-
- // Tests whether an escape occurs in the given string, starting at index i.
- // An escape sequence is a % followed by two hex digits.
- private static boolean isEscaped(String s, int i)
- {
- return s.charAt(i) == ESCAPE && s.length() > i + 2 &&
- matches(s.charAt(i + 1), HEX_HI, HEX_LO) &&
- matches(s.charAt(i + 2), HEX_HI, HEX_LO);
- }
-
- // Computes a three-character escape sequence for the byte, appending
- // it to the StringBuffer. Only characters up to 0xFF should be escaped;
- // all but the least significant byte will be ignored.
- private static void appendEscaped(StringBuffer result, byte b)
- {
- result.append(ESCAPE);
-
- // The byte is automatically widened into an int, with sign extension,
- // for shifting. This can introduce 1's to the left of the byte, which
- // must be cleared by masking before looking up the hex digit.
- //
- result.append(HEX_DIGITS[(b >> 4) & 0x0F]);
- result.append(HEX_DIGITS[b & 0x0F]);
- }
-
- /**
- * Decodes the given string, replacing each three-digit escape sequence by
- * the character that it represents. Incomplete escape sequences are
- * ignored.
- */
- public static String decode(String value)
- {
- if (value == null) return null;
-
- StringBuffer result = null;
-
- for (int i = 0, len = value.length(); i < len; i++)
- {
- if (isEscaped(value, i))
- {
- if (result == null)
- {
- result = new StringBuffer(value.substring(0, i));
- }
- result.append(unescape(value.charAt(i + 1), value.charAt(i + 2)));
- i += 2;
- }
- else if (result != null)
- {
- result.append(value.charAt(i));
- }
- }
- return result == null ? value : result.toString();
- }
-
- // Returns the character encoded by % followed by the two given hex digits,
- // which is always 0xFF or less, so can safely be casted to a byte. If
- // either character is not a hex digit, a bogus result will be returned.
- private static char unescape(char highHexDigit, char lowHexDigit)
- {
- return (char)((valueOf(highHexDigit) << 4) | valueOf(lowHexDigit));
- }
-
- // Returns the int value of the given hex digit.
- private static int valueOf(char hexDigit)
- {
- if (hexDigit >= 'A' && hexDigit <= 'F')
- {
- return hexDigit - 'A' + 10;
- }
- if (hexDigit >= 'a' && hexDigit <= 'f')
- {
- return hexDigit - 'a' + 10;
- }
- if (hexDigit >= '0' && hexDigit <= '9')
- {
- return hexDigit - '0';
- }
- return 0;
- }
-
-
- /**
- * This method takes two URIs, the first one relative, the second absolute. It
- * tries to resolve the first URI (making it absolute) by using the second one.
- * If the URI cannot be resolved, the relative one is returned unmodified.
- *
- * @param relativeURI
- * @param absoluteURI
- * @return relativeURI resolved (absolute) or relativeURI unmodified if it cannot
- * be resolved.
- */
- public static String resolveRelativeURI(String relativeURI, String absoluteURI) {
-
- String result = relativeURI;
-
- try {
- URI relative = URI.createURI(relativeURI);
- URI absolute = URI.createURI(absoluteURI);
- URI resolvedRelative = relative.resolve(absolute);
- result = resolvedRelative.toString();
- } catch (Exception e) {}
- return result;
- }
-
-
- /*
- * Returns <code>true</code> if this URI contains non-ASCII characters;
- * <code>false</code> otherwise.
- *
- * This unused code is included for possible future use...
- */
-/*
- public boolean isIRI()
- {
- return iri;
- }
-
- // Returns true if the given string contains any non-ASCII characters;
- // false otherwise.
- private static boolean containsNonASCII(String value)
- {
- for (int i = 0, len = value.length(); i < len; i++)
- {
- if (value.charAt(i) > 127) return true;
- }
- return false;
- }
-*/
-
- /*
- * If this is an {@link #isIRI IRI}, converts it to a strict ASCII URI,
- * using the procedure described in Section 3.1 of the
- * <a href="http://www.w3.org/International/iri-edit/draft-duerst-iri-09.txt">IRI
- * Draft RFC</a>. Otherwise, this URI, itself, is returned.
- *
- * This unused code is included for possible future use...
- */
-/*
- public URI toASCIIURI()
- {
- if (!iri) return this;
-
- if (cachedASCIIURI == null)
- {
- String eAuthority = encodeAsASCII(authority);
- String eDevice = encodeAsASCII(device);
- String eQuery = encodeAsASCII(query);
- String eFragment = encodeAsASCII(fragment);
- String[] eSegments = new String[segments.length];
- for (int i = 0; i < segments.length; i++)
- {
- eSegments[i] = encodeAsASCII(segments[i]);
- }
- cachedASCIIURI = new URI(hierarchical, scheme, eAuthority, eDevice, absolutePath, eSegments, eQuery, eFragment);
-
- }
- return cachedASCIIURI;
- }
-
- // Returns a strict ASCII encoding of the given value. Each non-ASCII
- // character is converted to bytes using UTF-8 encoding, which are then
- // represnted using % escaping.
- private String encodeAsASCII(String value)
- {
- if (value == null) return null;
-
- StringBuffer result = null;
-
- for (int i = 0, len = value.length(); i < len; i++)
- {
- char c = value.charAt(i);
-
- if (c >= 128)
- {
- if (result == null)
- {
- result = new StringBuffer(value.substring(0, i));
- }
-
- try
- {
- byte[] encoded = (new String(new char[] { c })).getBytes("UTF-8");
- for (int j = 0, encLen = encoded.length; j < encLen; j++)
- {
- appendEscaped(result, encoded[j]);
- }
- }
- catch (UnsupportedEncodingException e)
- {
- throw new WrappedException(e);
- }
- }
- else if (result != null)
- {
- result.append(c);
- }
-
- }
- return result == null ? value : result.toString();
- }
-
- // Returns the number of valid, consecutive, three-character escape
- // sequences in the given string, starting at index i.
- private static int countEscaped(String s, int i)
- {
- int result = 0;
-
- for (int len = s.length(); i < len; i += 3)
- {
- if (isEscaped(s, i)) result++;
- }
- return result;
- }
-*/
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java
deleted file mode 100644
index 647fa36..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java
+++ /dev/null
@@ -1,122 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.osgi.framework.Bundle;
-
-/**
- * A URI resolver extension descriptor contains all the information about
- * an extension URI resolver. The information contained allows for the
- * extension resolver to be instantiated and called at the correct times.
- */
-public class URIResolverExtensionDescriptor
-{
- protected URIResolverExtension resolver;
-
- protected String fileType;
-
- protected String className;
-
- public List projectNatureIds;
-
- protected String resourceType;
-
- protected int stage = URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION;
-
- protected String priority = URIResolverExtensionRegistry.PRIORITY_MEDIUM;
-
- protected String pluginId;
-
- protected boolean error;
-
- /**
- * Constructor.
- *
- * @param className The extension URI resolver class name.
- * @param pluginId The ID of the plugin that contains the extension URI resolver class.
- * @param projectNatureIds The project nature IDs for which the resolver should run.
- * @param resourceType The type of resource for which the resolver should run.
- * @param stage The stage of the resolver. Either prenormalization or postnormalization.
- * @param priority The resolver's priority. high, medium, or low.
- */
- public URIResolverExtensionDescriptor(String className, String pluginId,
- List projectNatureIds, String resourceType, int stage, String priority)
- {
- this.className = className;
- this.pluginId = pluginId;
- this.projectNatureIds = projectNatureIds;
- this.resourceType = resourceType;
- this.stage = stage;
- this.priority = priority;
- }
-
- /**
- * Get the extension URI resolver.
- *
- * @return The extension URI resolver.
- */
- public URIResolverExtension getResolver()
- {
-
- if (resolver == null && className != null && !error)
- {
- try
- {
- // Class theClass = classLoader != null ?
- // classLoader.loadClass(className) : Class.forName(className);
- Bundle bundle = Platform.getBundle(pluginId);
- Class theClass = bundle.loadClass(className);
- resolver = (URIResolverExtension) theClass.newInstance();
- } catch (Exception e)
- {
- error = true;
- e.printStackTrace();
- }
- }
- return resolver;
- }
-
- /**
- * Determines if the resolver should run in the current scenario given
- * the project nature ID, resource type, and stage.
- *
- * @param projectNatureId The project nature ID to check against.
- * @param resourceType The resource type to check against.
- * @param stage The stage to check against.
- * @return True if the resolver should run, false otherwise.
- */
- public boolean matches(String projectNatureId, String resourceType, int stage)
- {
- if (projectNatureIds.contains(projectNatureId))
- {
- return matches(this.resourceType, resourceType) && this.stage == stage;
- }
- return false;
- }
-
- /**
- * Determines if string a matches string b.
- * TODO: Why is this required instead of just using String.equals?
- *
- * @param a String for comparison.
- * @param b String for comparison.
- * @return True if the strings match, false otherwise.
- */
- private boolean matches(String a, String b)
- {
- return (a != null) ? a.equals(b) : a == b;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java
deleted file mode 100644
index d081bf1..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java
+++ /dev/null
@@ -1,162 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The URI resolver extension registry contains information about
- * all of the extension URI resolvers.
- */
-public class URIResolverExtensionRegistry
-{
- protected HashMap map = new HashMap();
-
- public static final int STAGE_PRENORMALIZATION = 1;
-
- public static final int STAGE_POSTNORMALIZATION = 2;
-
- public static final int STAGE_PHYSICAL = 3;
-
- public static final String PRIORITY_LOW = "low";
-
- public static final String PRIORITY_MEDIUM = "medium";
-
- public static final String PRIORITY_HIGH = "high";
-
- protected final static String NULL_PROJECT_NATURE_ID = "";
-
- protected static URIResolverExtensionRegistry instance;
-
- private URIResolverExtensionRegistry()
- {
- }
-
- /**
- * Get the one and only instance of the registry.
- *
- * @return The one and only instance of the registry.
- */
- public synchronized static URIResolverExtensionRegistry getIntance()
- {
- if (instance == null)
- {
- instance = new URIResolverExtensionRegistry();
- new URIResolverExtensionRegistryReader(instance).readRegistry();
- }
- return instance;
- }
-
- /**
- * Add an extension resolver to the registry.
- *
- * @param className The name of the extension URI resolver class.
- * @param pluginId The ID of the plugin that contains the extension URI resolver class.
- * @param projectNatureIds A list of project natures IDs for which the resolver should run.
- * @param resourceType The type of resoure for which an extension resource should run.
- * @param stage The stage to run. Either prenormalization or postnormalization.
- * @param priority The priority of the resolver. Valid values are high, medium, and low.
- */
- public void put(String className, String pluginId, List projectNatureIds,
- String resourceType, int stage, String priority)
- {
- if (projectNatureIds == null)
- projectNatureIds = new ArrayList();
- if (projectNatureIds.isEmpty())
- {
- projectNatureIds.add(NULL_PROJECT_NATURE_ID);
- }
- URIResolverExtensionDescriptor info = new URIResolverExtensionDescriptor(
- className, pluginId, projectNatureIds, resourceType, stage, priority);
-
- Iterator idsIter = projectNatureIds.iterator();
- while (idsIter.hasNext())
- {
- String key = (String) idsIter.next();
-
- HashMap priorityMap = (HashMap) map.get(key);
- if (priorityMap == null)
- {
- priorityMap = new HashMap();
- map.put(key, priorityMap);
- priorityMap.put(PRIORITY_HIGH, new ArrayList());
- priorityMap.put(PRIORITY_MEDIUM, new ArrayList());
- priorityMap.put(PRIORITY_LOW, new ArrayList());
- }
- List list = (List) priorityMap.get(priority);
- list.add(info);
- }
- }
-
- /**
- * Return a list of URIResolverExtensionDescriptor objects that apply to this
- * project. The list is in the priority order high, medium, low.
- *
- * @param project The project for which you are requesting resolvers.
- * @return A list of URIResolverExtensionDescriptor objects.
- */
- public List getExtensionDescriptors(IProject project)
- {
- List result = new ArrayList();
- for (Iterator i = map.keySet().iterator(); i.hasNext();)
- {
- String key = (String) i.next();
- try
- {
- if (key == NULL_PROJECT_NATURE_ID || project == null
- || project.hasNature(key))
- {
- result.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_HIGH));
- result.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_MEDIUM));
- result.addAll((List) ((HashMap) map.get(key)).get(PRIORITY_LOW));
- }
- } catch (CoreException e)
- {
- }
- }
- return result;
- }
-
- /**
- * Return a list of URIResolver objects that match the stage.
- * TODO: This seems like an odd method to house here. It may need to be moved
- * or removed if the stage attribute dissapears.
- *
- * @param resolverInfoList A list of resolvers to prune.
- * @param stage The stage requested.
- * @return A list of URIResolver objects that match the stage.
- */
- public List getMatchingURIResolvers(List resolverInfoList, int stage)
- {
- List result = new ArrayList();
- for (Iterator i = resolverInfoList.iterator(); i.hasNext();)
- {
- URIResolverExtensionDescriptor info = (URIResolverExtensionDescriptor) i
- .next();
- if (info.stage == stage)
- {
- Object resolver = info.getResolver();
- if (resolver != null)
- {
- result.add(resolver);
- }
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
deleted file mode 100644
index a173f28..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
+++ /dev/null
@@ -1,136 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-
-/**
- * This class reads the URI resolver extension point and registers extension
- * resolvers with the URI resolver registry.
- */
-public class URIResolverExtensionRegistryReader
-{
-
- protected static final String EXTENSION_POINT_ID = "resolverExtensions";
-
- protected static final String TAG_NAME = "resolverExtension";
-
- protected static final String ATT_ID = "id";
-
- protected static final String ELEM_PROJECT_NATURE_ID = "projectNature";
-
- protected static final String ATT_RESOURCE_TYPE = "resourceType";
-
- protected static final String ATT_CLASS = "class";
-
- protected static final String ATT_STAGE = "stage";
-
- protected static final String VAL_STAGE_PRE = "prenormalization";
-
- protected static final String VAL_STAGE_POST = "postnormalization";
-
- protected static final String VAL_STAGE_PHYSICAL = "physical";
-
- protected static final String ATT_VALUE = "value";
-
- protected static final String ATT_PRIORITY = "priority";
-
- protected URIResolverExtensionRegistry registry;
-
- public URIResolverExtensionRegistryReader(URIResolverExtensionRegistry registry)
- {
- this.registry = registry;
- }
-
- /**
- * read from plugin registry and parse it.
- */
- public void readRegistry()
- {
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(URIResolverPlugin
- .getInstance().getBundle().getSymbolicName(), EXTENSION_POINT_ID);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- readElement(elements[i]);
- }
- }
- }
-
- /**
- * readElement() - parse and deal with an extension like:
- *
- * <extension point="org.eclipse.wst.contentmodel.util_implementation">
- * <util_implementation class =
- * org.eclipse.wst.baseutil.CMUtilImplementationImpl /> </extension>
- */
- protected void readElement(IConfigurationElement element)
- {
- if (element.getName().equals(TAG_NAME))
- {
- // String id = element.getAttribute(ATT_ID);
- String className = element.getAttribute(ATT_CLASS);
- // String projectNatureId = element.getAttribute(ATT_PROJECT_NATURE_ID);
- String resourceType = element.getAttribute(ATT_RESOURCE_TYPE);
- String stage = element.getAttribute(ATT_STAGE);
- String priority = element.getAttribute(ATT_PRIORITY);
- if (priority == null || priority.equals(""))
- {
- priority = URIResolverExtensionRegistry.PRIORITY_MEDIUM;
- }
- List projectNatureIds = new ArrayList();
- IConfigurationElement[] ids = element.getChildren(ELEM_PROJECT_NATURE_ID);
- int numids = ids.length;
- for (int i = 0; i < numids; i++)
- {
- String tempid = ids[i].getAttribute(ATT_VALUE);
-
- if (tempid != null)
- {
- projectNatureIds.add(tempid);
- }
- }
- if (className != null)
- {
- try
- {
- String pluginId = element.getDeclaringExtension().getNamespaceIdentifier();
-
- int stageint = URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION;
- if (stage.equalsIgnoreCase(VAL_STAGE_PRE))
- {
- stageint = URIResolverExtensionRegistry.STAGE_PRENORMALIZATION;
- } else if (stage.equalsIgnoreCase(VAL_STAGE_PHYSICAL))
- {
- stageint = URIResolverExtensionRegistry.STAGE_PHYSICAL;
- }
- registry.put(className, pluginId, projectNatureIds, resourceType,
- stageint, priority);
- } catch (Exception e)
- {
- // TODO: Log exception as this will cause an extension resolver
- // from loading.
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolver.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolver.java
deleted file mode 100644
index ef0a4ca..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolver.java
+++ /dev/null
@@ -1,34 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal.provisional;
-
-/**
- * A URIResolver is used to resolve URI references to resources.
- */
-public interface URIResolver {
-
- /**
- * @param baseLocation - the location of the resource that contains the uri
- * @param publicId - an optional public identifier (i.e. namespace name), or null if none
- * @param systemId - an absolute or relative URI, or null if none
- * @return an absolute URI represention the 'logical' location of the resource
- */
- public String resolve(String baseLocation, String publicId, String systemId);
-
- /**
- * @param baseLocation - the location of the resource that contains the uri
- * @param publicId - an optional public identifier (i.e. namespace name), or null if none
- * @param systemId - an absolute or relative URI, or null if none
- * @return an absolute URI represention the 'physical' location of the resource
- */
- public String resolvePhysicalLocation(String baseLocation, String publicId, String logicalLocation);
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverExtension.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverExtension.java
deleted file mode 100644
index 16d61e7..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverExtension.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal.provisional;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * An extension to augment the behaviour of a URIResolver. Extensions are project aware
- * so that they can apply specialized project specific resolving rules.
- */
-public interface URIResolverExtension {
- /**
- * @param file the in-workspace base resource, if one exists
- * @param baseLocation - the location of the resource that contains the uri
- * @param publicId - an optional public identifier (i.e. namespace name), or null if none
- * @param systemId - an absolute or relative URI, or null if none
- *
- * @return an absolute URI or null if this extension can not resolve this reference
- */
- public String resolve(IFile file, String baseLocation, String publicId, String systemId);
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverPlugin.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverPlugin.java
deleted file mode 100644
index 2b63687..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/provisional/URIResolverPlugin.java
+++ /dev/null
@@ -1,46 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal.provisional;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.uriresolver.internal.ExtensibleURIResolver;
-import org.eclipse.wst.common.uriresolver.internal.URIResolverExtensionRegistry;
-
-
-public class URIResolverPlugin extends Plugin {
- protected static URIResolverPlugin instance;
- protected URIResolverExtensionRegistry xmlResolverExtensionRegistry;
-
- public static URIResolverPlugin getInstance()
- {
- return instance;
- }
-
- public URIResolverPlugin() {
- super();
- instance = this;
- }
-
-
- public static URIResolver createResolver()
- {
- return createResolver(null);
- }
-
- public static URIResolver createResolver(Map properties)
- {
- // TODO... utilize properties
- return new ExtensibleURIResolver();
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIEncoder.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIEncoder.java
deleted file mode 100644
index 6fc7c9e..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIEncoder.java
+++ /dev/null
@@ -1,204 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal.util;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.BitSet;
-
-/**
- * This class is a modified version of java.lang.URLEncoder.
- */
-public class URIEncoder
-{
- static BitSet dontNeedEncoding;
- static final int caseDiff = ('a' - 'A');
- static String dfltEncName = null;
-
-
- static
- {
- dontNeedEncoding = new BitSet(256);
- int i;
- for (i = 'a'; i <= 'z'; i++)
- {
- dontNeedEncoding.set(i);
- }
- for (i = 'A'; i <= 'Z'; i++)
- {
- dontNeedEncoding.set(i);
- }
- for (i = '0'; i <= '9'; i++)
- {
- dontNeedEncoding.set(i);
- }
-
- //dontNeedEncoding.set(' '); // cs.. removed so that space character will be replaced by %20
- dontNeedEncoding.set('-');
- dontNeedEncoding.set('_');
- dontNeedEncoding.set('.');
- dontNeedEncoding.set('*');
- dontNeedEncoding.set(':'); // cs.. added
- dontNeedEncoding.set('/'); // cs.. added so that slashes don't get encoded as %2F
-
- // dfltEncName = (String)AccessController.doPrivileged(new GetPropertyAction("file.encoding"));
- // As discussed with Sandy, we should encode URIs with UTF8
- dfltEncName = "UTF8";
- //System.out.println("dfltEncName " + dfltEncName);
- }
-
- /**
- * You can't call the constructor.
- */
- private URIEncoder() { }
-
- /**
- * Translates a string into <code>x-www-form-urlencoded</code>
- * format. This method uses the platform's default encoding
- * as the encoding scheme to obtain the bytes for unsafe characters.
- *
- * @param s <code>String</code> to be translated.
- * @deprecated The resulting string may vary depending on the platform's
- * default encoding. Instead, use the encode(String,String)
- * method to specify the encoding.
- * @return the translated <code>String</code>.
- */
- public static String encode(String s)
- {
- String str = null;
- try
- {
- str = encode(s, dfltEncName);
- }
- catch (UnsupportedEncodingException e)
- {
- // The system should always have the platform default
- }
- return str;
- }
-
- /**
- * Translates a string into <code>application/x-www-form-urlencoded</code>
- * format using a specific encoding scheme. This method uses the
- * supplied encoding scheme to obtain the bytes for unsafe
- * characters.
- * <p>
- * <em><strong>Note:</strong> The <a href=
- * "http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars">
- * World Wide Web Consortium Recommendation</a> states that
- * UTF-8 should be used. Not doing so may introduce
- * incompatibilites.</em>
- *
- * @param s <code>String</code> to be translated.
- * @param enc The name of a supported
- * <a href="../lang/package-summary.html#charenc">character
- * encoding</a>.
- * @return the translated <code>String</code>.
- * @exception UnsupportedEncodingException
- * If the named encoding is not supported
- * @see java.net.URLDecoder#decode(java.lang.String, java.lang.String)
- */
- public static String encode(String s, String enc) throws UnsupportedEncodingException
- {
- boolean needToChange = false;
- boolean wroteUnencodedChar = false;
- int maxBytesPerChar = 10; // rather arbitrary limit, but safe for now
- StringBuffer out = new StringBuffer(s.length());
- ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(buf, enc));
-
- for (int i = 0; i < s.length(); i++)
- {
- int c = s.charAt(i);
- //System.out.println("Examining character: " + c);
- if (dontNeedEncoding.get(c))
- {
- //if (c == ' ')
- //{
- // c = '+';
- // needToChange = true;
- //}
- //System.out.println("Storing: " + c);
- out.append((char)c);
- wroteUnencodedChar = true;
- }
- else
- {
- // convert to external encoding before hex conversion
- try
- {
- if (wroteUnencodedChar)
- { // Fix for 4407610
- writer = new BufferedWriter(new OutputStreamWriter(buf, enc));
- wroteUnencodedChar = false;
- }
- writer.write(c);
-
- // If this character represents the start of a Unicode
- // surrogate pair, then pass in two characters. It's not
- // clear what should be done if a bytes reserved in the
- // surrogate pairs range occurs outside of a legal
- // surrogate pair. For now, just treat it as if it were
- // any other character.
- //
- if (c >= 0xD800 && c <= 0xDBFF)
- {
- // System.out.println(Integer.toHexString(c) + " is high surrogate");
- if ( (i+1) < s.length())
- {
- int d = s.charAt(i+1);
- // System.out.println("\tExamining " + Integer.toHexString(d));
- if (d >= 0xDC00 && d <= 0xDFFF)
- {
- // System.out.println("\t" + Integer.toHexString(d) + " is low surrogate");
- writer.write(d);
- i++;
- }
- }
- }
- writer.flush();
- }
- catch(IOException e)
- {
- buf.reset();
- continue;
- }
- byte[] ba = buf.toByteArray();
-
- for (int j = 0; j < ba.length; j++)
- {
- out.append('%');
- char ch = Character.forDigit((ba[j] >> 4) & 0xF, 16);
- // converting to use uppercase letter as part of
- // the hex value if ch is a letter.
- if (Character.isLetter(ch))
- {
- ch -= caseDiff;
- }
- out.append(ch);
- ch = Character.forDigit(ba[j] & 0xF, 16);
- if (Character.isLetter(ch))
- {
- ch -= caseDiff;
- }
- out.append(ch);
- }
- buf.reset();
- needToChange = true;
- }
- }
- return (needToChange? out.toString() : s);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
deleted file mode 100644
index f9540b3..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
+++ /dev/null
@@ -1,528 +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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.common.uriresolver.internal.util;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URL;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
-public class URIHelper
-{
- protected static final String FILE_PROTOCOL = "file:";
- protected static final String PLATFORM_RESOURCE_PROTOCOL = "platform:/resource/";
- protected static final String PROTOCOL_PATTERN = ":";
-
-
- public static String ensureURIProtocolFormat(String uri) {
- String protocol = getProtocol(uri);
- if (protocol != null) {
- if (protocol.equals(FILE_PROTOCOL)) {
- return ensureFileURIProtocolFormat(uri);
- }
- }
- return uri;
- }
-
-
- /**
- * This method takes a file URI in String format and ensures the protocol is followed by three slashes.
- * For example, files "file:D:/XXX", "file:/D:/XXX" and "file://D:/XXX" are corrected to:
- * "file:///D:/XXX".
- * If the input is not a file URI (does not start with "file:"), the String is returned unmodified.
- */
- public static String ensureFileURIProtocolFormat(String uri) {
- if (uri.startsWith(FILE_PROTOCOL) && !uri.startsWith(FILE_PROTOCOL + "///")) //$NON-NLS-1$
- {
- if (uri.startsWith(FILE_PROTOCOL + "//")) {
- uri = FILE_PROTOCOL + "/" + uri.substring(FILE_PROTOCOL.length()); //$NON-NLS-1$
- } else if (uri.startsWith(FILE_PROTOCOL + "/")) {
- uri = FILE_PROTOCOL + "//" + uri.substring(FILE_PROTOCOL.length()); //$NON-NLS-1$
- } else {
- uri = FILE_PROTOCOL + "///" + uri.substring(FILE_PROTOCOL.length()); //$NON-NLS-1$
- }
- }
- return uri;
- }
-
- public static String normalize(String uri)
- {
- if (uri != null)
- {
- String protocol = getProtocol(uri);
- String file = uri;
-
- if (protocol != null)
- {
- try
- {
- //
- URL url = new URL(uri);
- // we use a 'Path' on the 'file' part of the url in order to normalize the '.' and '..' segments
- IPath path = new Path(url.getFile());
- URL url2 = new URL(url.getProtocol(), url.getHost(), url.getPort(), path.toString());
- uri = url2.toString();
- }
- catch (Exception e)
- {
- }
- }
- else
- {
- IPath path = new Path(file);
- uri = path.toString();
- }
- }
- return uri;
- }
-
-
- /**
- * a 'null' rootLocation argument will causes uri that begins with a '/' to be treated as a workspace relative resource
- * (i.e. the string "platform:/resource" is prepended and the uri is resolved via the Platform object)
- */
- public static String normalize(String uri, String resourceLocation, String rootLocation)
- {
- String result = null;
-
- if (uri != null)
- {
- // is the uri a url
- if (hasProtocol(uri))
- {
- if (isPlatformResourceProtocol(uri))
- {
- result = resolvePlatformUrl(uri);
- }
- else
- {
- result = uri;
- }
- }
-
- // is uri absolute
- //
- if (result == null)
- {
- if (uri.indexOf(":") != -1 || uri.startsWith("/") || uri.startsWith("\\"))
- {
- result = uri;
- }
- }
-
- // if uri is relative to the resourceLocation
- //
- if (result == null && resourceLocation != null)
- {
- if (resourceLocation.endsWith("/"))
- {
- result = resourceLocation + uri;
- }
- else
- {
- result = resourceLocation + "/../" + uri;
- }
- }
-
- if (result == null)
- {
- result = uri;
- }
-
- result = normalize(result);
- }
-
- //System.out.println("normalize(" + uri + ", " + resourceLocation + ", " + rootLocation + ") = " + result);
- return result;
- }
-
-
- public static boolean isURL(String uri)
- {
- return uri.indexOf(":/") > 2; // test that the index is > 2 so that C:/ is not considered a protocol
- }
-
-
- public static String getLastSegment(String uri)
- {
- String result = uri;
- int index = Math.max(uri.lastIndexOf("/"), uri.lastIndexOf("\\"));
- if (index != -1)
- {
- result = uri.substring(index + 1);
- }
- return result;
- }
-
-
- public static String getFileExtension(String uri)
- {
- String result = null;
- int dotIndex = getExtensionDotIndex(uri);
-
- if (dotIndex != -1)
- {
- result = uri.substring(dotIndex + 1);
- }
-
- return result;
- }
-
-
- public static String removeFileExtension(String uri)
- {
- String result = null;
- int dotIndex = getExtensionDotIndex(uri);
-
- if (dotIndex != -1)
- {
- result = uri.substring(0, dotIndex);
- }
-
- return result;
- }
-
-
- // here we use the Platform to resolve a workspace relative path to an actual url
- //
- protected static String resolvePlatformUrl(String urlspec)
- {
- String result = null;
- try
- {
- urlspec = urlspec.replace('\\', '/');
- URL url = new URL(urlspec);
- URL resolvedURL = FileLocator.resolve(url);
- result = resolvedURL.toString();
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
-
- protected static int getExtensionDotIndex(String uri)
- {
- int result = -1;
- int dotIndex = uri.lastIndexOf(".");
- int slashIndex = Math.max(uri.lastIndexOf("/"), uri.lastIndexOf("\\"));
-
- if (dotIndex != -1 && dotIndex > slashIndex)
- {
- result = dotIndex;
- }
-
- return result;
- }
-
-
- public static boolean isPlatformResourceProtocol(String uri)
- {
- return uri != null && uri.startsWith(PLATFORM_RESOURCE_PROTOCOL);
- }
-
- public static String removePlatformResourceProtocol(String uri)
- {
- if (uri != null && uri.startsWith(PLATFORM_RESOURCE_PROTOCOL))
- {
- uri = uri.substring(PLATFORM_RESOURCE_PROTOCOL.length());
- }
- return uri;
- }
-
-
- public static String prependPlatformResourceProtocol(String uri)
- {
- if (uri != null && !uri.startsWith(PLATFORM_RESOURCE_PROTOCOL))
- {
- uri = PLATFORM_RESOURCE_PROTOCOL + uri;
- }
- return uri;
- }
-
-
- public static String prependFileProtocol(String uri)
- {
- if (uri != null && !uri.startsWith(FILE_PROTOCOL))
- {
- uri = FILE_PROTOCOL + uri;
- }
- return uri;
- }
-
- public static boolean hasProtocol(String uri)
- {
- boolean result = false;
- if (uri != null)
- {
- int index = uri.indexOf(PROTOCOL_PATTERN);
- if (index != -1 && index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
- {
- result = true;
- }
- }
- return result;
- }
-
-
- public static boolean isAbsolute(String uri)
- {
- boolean result = false;
- if (uri != null)
- {
- int index = uri.indexOf(PROTOCOL_PATTERN);
- if (index != -1 || uri.startsWith("/") || uri.startsWith("\\"))
- {
- result = true;
- }
- }
- return result;
- }
-
-
- public static String addImpliedFileProtocol(String uri)
- {
- if (!hasProtocol(uri))
- {
- String prefix = FILE_PROTOCOL;
- prefix += uri.startsWith("/") ? "//" : "///";
- uri = prefix + uri;
- }
- return uri;
- }
-
- // todo... need to revisit this before we publicize it
- //
- protected static String getProtocol(String uri)
- {
- String result = null;
- if (uri != null)
- {
- int index = uri.indexOf(PROTOCOL_PATTERN);
- if (index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
- {
- result = uri.substring(0, index + PROTOCOL_PATTERN.length());
- }
- }
- return result;
- }
-
-
- public static String removeProtocol(String uri)
- {
- String result = uri;
- if (uri != null)
- {
- int index = uri.indexOf(PROTOCOL_PATTERN);
- if (index > 2)
- {
- result = result.substring(index + PROTOCOL_PATTERN.length());
- }
- }
- return result;
- }
-
-
- protected static boolean isProtocolFileOrNull(String uri)
- {
- String protocol = getProtocol(uri);
- return protocol == null || protocol.equals(FILE_PROTOCOL);
- }
-
-
- protected static boolean isMatchingProtocol(String uri1, String uri2)
- {
- boolean result = false;
-
- String protocol1 = getProtocol(uri1);
- String protocol2 = getProtocol(uri2);
-
- if (isProtocolFileOrNull(protocol1) && isProtocolFileOrNull(protocol2))
- {
- result = true;
- }
- else
- {
- result = protocol1 != null && protocol2 != null && protocol1.equals(protocol2);
- }
-
- return result;
- }
-
- /**
- * warning... this method not fully tested yet
- */
- public static String getRelativeURI(String uri, String resourceLocation)
- {
- String result = uri;
- if (isMatchingProtocol(uri, resourceLocation))
- {
- result = getRelativeURI(new Path(removeProtocol(uri)),
- new Path(removeProtocol(resourceLocation)));
- }
-
- return result;
- }
-
- /**
- * warning... this method not fully tested yet
- */
- public static String getRelativeURI(IPath uri, IPath resourceLocation)
- {
- String result = null;
- int nMatchingSegments = 0;
- resourceLocation = resourceLocation.removeLastSegments(1);
- while (true)
- {
- String a = uri.segment(nMatchingSegments);
- String b = resourceLocation.segment(nMatchingSegments);
- if (a != null && b != null && a.equals(b))
- {
- nMatchingSegments++;
- }
- else
- {
- break;
- }
- }
-
- if (nMatchingSegments == 0)
- {
- result = uri.toOSString();
- }
- else
- {
- result = "";
- boolean isFirst = true;
- String[] segments = resourceLocation.segments();
- for (int i = nMatchingSegments; i < segments.length; i++)
- {
- result += isFirst ? ".." : "/..";
- if (isFirst)
- {
- isFirst = false;
- }
- }
- //
- segments = uri.segments();
- for (int i = nMatchingSegments; i < segments.length; i++)
- {
- result += isFirst ? segments[i] : ("/" + segments[i]);
- if (isFirst)
- {
- isFirst = false;
- }
- }
- }
- return result;
- }
-
-
- public static String getPlatformURI(IResource resource)
- {
- String fullPath = resource.getFullPath().toString();
- if (fullPath.startsWith("/"))
- {
- fullPath = fullPath.substring(1);
- }
- return PLATFORM_RESOURCE_PROTOCOL + fullPath;
- }
-
-
- /**
- * This methods is used as a quick test to see if a uri can be resolved to an existing resource.
- */
- public static boolean isReadableURI(String uri, boolean testRemoteURI)
- {
- boolean result = true;
- if (uri != null)
- {
- try
- {
- uri = normalize(uri, null, null);
- if (isProtocolFileOrNull(uri))
- {
- uri = removeProtocol(uri);
- File file = new File(org.eclipse.wst.common.uriresolver.internal.URI.decode(uri));
- result = file.exists() && file.isFile();
- }
- else if (isPlatformResourceProtocol(uri))
- {
- // Note - If we are here, uri has been failed to resolve
- // relative to the Platform. See normalize() to find why.
- result = false;
- }
- else if (testRemoteURI)
- {
- URL url = new URL(uri);
- InputStream is = url.openConnection().getInputStream();
- is.close();
- // the uri is readable if we reach here.
- result = true;
- }
- }
- catch (Exception e)
- {
- result = false;
- }
- }
- else // uri is null
- result = false;
-
- return result;
- }
-
- /**
- * return true if this is a valid uri
- */
- public static boolean isValidURI(String uri)
- {
- boolean result = false;
- try
- {
- new URI(uri);
- result = true;
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
- /**
- * returns an acceptable URI for a file path
- */
- public static String getURIForFilePath(String filePath)
- {
- String result = addImpliedFileProtocol(filePath);
- if (!isValidURI(result))
- {
- try
- {
- result = URIEncoder.encode(result, "UTF8");
- }
- catch(UnsupportedEncodingException e)
- {
- // Do nothing as long as UTF8 is used. This is supported.
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/.classpath b/plugins/org.eclipse.wst.internet.cache/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/plugins/org.eclipse.wst.internet.cache/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.internet.cache/.cvsignore b/plugins/org.eclipse.wst.internet.cache/.cvsignore
deleted file mode 100644
index 0515302..0000000
--- a/plugins/org.eclipse.wst.internet.cache/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-cache.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.internet.cache/.project b/plugins/org.eclipse.wst.internet.cache/.project
deleted file mode 100644
index d7188f0..0000000
--- a/plugins/org.eclipse.wst.internet.cache/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.internet.cache</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.internet.cache/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.internet.cache/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 53d1a0e..0000000
--- a/plugins/org.eclipse.wst.internet.cache/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Wed Mar 15 17:27:33 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-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=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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=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.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=warning
-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=warning
-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.3
diff --git a/plugins/org.eclipse.wst.internet.cache/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.internet.cache/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82024b2..0000000
--- a/plugins/org.eclipse.wst.internet.cache/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Mar 15 17:27:33 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF
deleted file mode 100644
index a9b084c..0000000
--- a/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.internet.cache; singleton:=true
-Bundle-Version: 1.0.201.qualifier
-Bundle-Activator: org.eclipse.wst.internet.cache.internal.CachePlugin
-Bundle-Vendor: %_PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.internet.cache.internal;x-friends:="org.eclipse.wst.internet.cache.tests",
- org.eclipse.wst.internet.cache.internal.preferences;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.internet.cache/about.html b/plugins/org.eclipse.wst.internet.cache/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/plugins/org.eclipse.wst.internet.cache/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors 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.internet.cache/build.properties b/plugins/org.eclipse.wst.internet.cache/build.properties
deleted file mode 100644
index dbd4f60..0000000
--- a/plugins/org.eclipse.wst.internet.cache/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- plugin.properties,\
- about.html
-src.includes = exsd/,\
- .,\
- build.properties
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd b/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
deleted file mode 100644
index bacb272..0000000
--- a/plugins/org.eclipse.wst.internet.cache/exsd/cacheresource.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.internet.cache">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.internet.cache" id="cacheresource" name="Cache Resource"/>
- </appInfo>
- <documentation>
- The cache resource extension point allows clients to specify resources that may be cached that require licenses to be accepted prior to caching.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="cacheresource" 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>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="cacheresource">
- <complexType>
- <attribute name="url" type="string" use="required">
- <annotation>
- <documentation>
- The URL of the resource to cache.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="license" type="string" use="required">
- <annotation>
- <documentation>
- The license of the resource to cache. The license is specified as a URL that resolves to a file that contains the license.
- </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>
- The following is an example of a cache resource contribution:
-<pre>
- <extension
- point="org.eclipse.wst.internet.cache.cacheresource">
- <cacheresource
- license="http://www.eclipse.org/license.html"
- url="http://www.eclipse.org"/>
- </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) 2000, 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.internet.cache/plugin.properties b/plugins/org.eclipse.wst.internet.cache/plugin.properties
deleted file mode 100644
index 5df72b9..0000000
--- a/plugins/org.eclipse.wst.internet.cache/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-_PLUGIN_PROVIDER = Eclipse.org
-_PLUGIN_NAME = Cache URI Resolver Plug-in
-
-cacheResource = Cache Resource
-_UI_CACHE_PREFERENCE_PAGE_TITLE = Cache
-
diff --git a/plugins/org.eclipse.wst.internet.cache/plugin.xml b/plugins/org.eclipse.wst.internet.cache/plugin.xml
deleted file mode 100644
index 09c05eb..0000000
--- a/plugins/org.eclipse.wst.internet.cache/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point name="%cacheResource" id="cacheresource" schema="exsd/cacheresource.exsd"/>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%_UI_CACHE_PREFERENCE_PAGE_TITLE"
- class="org.eclipse.wst.internet.cache.internal.preferences.CachePreferencePage"
- id="org.eclipse.wst.internet.cache.internal.preferences.CachePreferencePage"
- category = "org.eclipse.internet">
- </page>
- </extension>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="org.eclipse.wst.internet.cache.internal.preferences.PreferenceInitializer">
- </initializer>
- </extension>
-
- <extension point="org.eclipse.wst.common.uriresolver.resolverExtensions">
- <resolverExtension
- stage="physical"
- priority="low"
- class="org.eclipse.wst.internet.cache.internal.CacheURIResolverExtension">
- </resolverExtension>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/Cache.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/Cache.java
deleted file mode 100644
index 399f421..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/Cache.java
+++ /dev/null
@@ -1,523 +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.internet.cache.internal;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Random;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * The cache holds references to remote resources. The cache can store resources,
- * retrieve resources, and delete resources.
- *
- */
-public class Cache
-{
- /**
- * String instances.
- */
- private static final String URI = "uri";
- private static final String LOCATION ="location";
- private static final String ENTRY = "entry";
- private static final String CACHE = "cache";
- private static final String LAST_MODIFIED = "lastModified";
- private static final String EXPIRATION_TIME = "expirationTime";
- private static final String FILE_PROTOCOL = "file:///";
- private static final String CACHE_FILE = "cache.xml";
- private static final String CACHE_EXTENSION = ".cache";
- private static final String CACHE_PREFIX = "wtpcache";
- private static final String CACHE_SUFFIX = null;
- /**
- * The default timeout for a cache entry is 1 day.
- */
- private static final long TIMEOUT = 86400000;
-
- /**
- * The one and only instance of the cache.
- */
- private static Cache cacheInstance = null;
-
- /**
- * The cache is stored in a hashtable.
- */
- private Hashtable cache;
-
- /**
- * A set of uncached resources. The cache was not able to cache resources
- * in this list. This list allows quickly skipping over these resources in
- * future requests.
- */
- private Set uncached;
-
- /**
- * The location of the cache
- */
- private File cacheLocation = null;
-
- /**
- * Private constructor.
- */
- protected Cache(IPath cacheLocation)
- {
- this.cacheLocation = cacheLocation.toFile();//Platform.getPluginStateLocation(CachePlugin.getDefault()).toFile();
- cache = new Hashtable();
- uncached = new HashSet();
- }
-
- /**
- * Get the one and only instance of the cache.
- *
- * @return The one and only instance of the cache.
- */
- public static Cache getInstance()
- {
-// if(cacheInstance == null)
-// {
-// cacheInstance = new Cache(cacheLocation);
-// cacheInstance.open(cacheLocation);
-// }
- return cacheInstance;
- }
-
- /**
- * Return the local resource for the specified uri. If there is no resource
- * the cache will attempt to download and cache the resource before returning.
- * If a remote resource cannot be cached this method will return null.
- *
- * @param uri The URI for which a resource is requested.
- * @return The local resource for the specified URI or null if a remote resource cannot be cached.
- */
- public String getResource(String uri)
- {
- if(uri == null) return null;
- CacheEntry result = (CacheEntry)cache.get(uri);
-
- // If no result is in the cache and the URI is of an allowed type
- // retrieve it and store it in the cache.
- if(result == null)
- {
-
- if(!uncached.contains(uri))
- {
- result = cacheResource(uri);
- }
- }
- // Retreive a fresh copy of the result if it has timed out.
- else if(result.hasExpired())
- {
- result = refreshCacheEntry(result);
- }
- if(result == null || result.getLocalFile() == null)
- {
- return null;
- }
- return FILE_PROTOCOL + cacheLocation.toString() + "/" + result.getLocalFile();
- }
-
- /**
- * Get the list of uncached resources.
- *
- * @return The list of uncached resources.
- */
- protected String[] getUncachedURIs()
- {
- return (String[])uncached.toArray(new String[uncached.size()]);
- }
-
- /**
- * Clear the list of uncached resources.
- */
- protected void clearUncachedURIs()
- {
- uncached.clear();
- }
-
- /**
- * Add an uncached resource to the list and start the
- * uncached job if not already started.
- */
- protected void addUncachedURI(String uri)
- {
- CacheJob.startJob();
- uncached.add(uri);
- }
-
- /**
- * Cache the specified resource. This method creates a local version of the
- * remote resource and adds the resource reference to the cache. If the resource
- * cannot be accessed it is not added and null is returned.
- *
- * @param uri The remote URI to cache.
- * @return A new CacheEntry representing the cached resource or null if the remote
- * resource could not be retrieved.
- */
- protected CacheEntry cacheResource(String uri)
- {
- CacheEntry cacheEntry = null;
- URLConnection conn = null;
- InputStream is = null;
- OutputStream os = null;
- try
- {
- URL url = new URL(uri);
- conn = url.openConnection();
- conn.connect();
- // Determine if this resource can be cached.
- if(conn.getUseCaches())
- {
- is = conn.getInputStream();//url.openStream();
-
- Random rand = new Random();
- String fileName = rand.nextInt() + CACHE_EXTENSION;
- File file = new File(cacheLocation, fileName);
- // If the file already exists we need to change the file name.
- while(!file.createNewFile())
- {
- fileName = rand.nextInt() + CACHE_EXTENSION;
- file = new File(cacheLocation,fileName);
- }
- os = new FileOutputStream(file);
- byte[] bytes = new byte[1024];
- int bytelength;
- while((bytelength = is.read(bytes)) != -1)
- {
- os.write(bytes, 0, bytelength);
- }
- long lastModified = conn.getLastModified();
- long expiration = conn.getExpiration();
- if(expiration == 0)
- {
- expiration = System.currentTimeMillis() + TIMEOUT;
- }
- cacheEntry = new CacheEntry(uri, fileName, lastModified, expiration);
- cache.put(uri,cacheEntry);
- }
-
- }
- catch(Exception t)
- {
- // Put the entry in the uncached list so the resolution work will not be performed again.
- // TODO: Add in a timeout for the non-located uris.
- addUncachedURI(uri);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing if the stream cannot be closed.
- }
- }
- if(os != null)
- {
- try
- {
- os.close();
- }
- catch(IOException e)
- {
- // Do nothing if the stream cannot be closed.
- }
- }
- }
- return cacheEntry;
- }
-
- /**
- * Refresh the cache entry if necessary. The cache entry will be refreshed
- * if the remote resource is accessible and the last modified time of the
- * remote resource is greater than the last modified time of the cached
- * resource.
- *
- * @param cacheEntry The cache entry to refresh.
- * @return The refreshed cache entry.
- */
- protected CacheEntry refreshCacheEntry(CacheEntry cacheEntry)
- {
- URLConnection conn = null;
- InputStream is = null;
- OutputStream os = null;
- try
- {
- URL url = new URL(cacheEntry.getURI());
- conn = url.openConnection();
- conn.connect();
-
- long lastModified = conn.getLastModified();
- if(lastModified > cacheEntry.getLastModified())
- {
- long expiration = conn.getExpiration();
- if(expiration == 0)
- {
- expiration = System.currentTimeMillis() + TIMEOUT;
- }
-
- is = conn.getInputStream();
-
- String localFile = cacheEntry.getLocalFile();
-
- File tempFile = File.createTempFile(CACHE_PREFIX, CACHE_SUFFIX);
- tempFile.deleteOnExit();
-
- os = new FileOutputStream(tempFile);
- byte[] bytes = new byte[1024];
- int bytelength;
- while((bytelength = is.read(bytes)) != -1)
- {
- os.write(bytes, 0, bytelength);
- }
- is.close();
- os.close();
- deleteFile(cacheEntry.getURI());
- File f = new File(cacheLocation, localFile);
- tempFile.renameTo(f);
- cacheEntry.setExpiration(expiration);
- cacheEntry.setLastModified(lastModified);
- }
- // The cache entry hasn't changed. Just update the expiration time.
- else
- {
- long expiration = conn.getExpiration();
- if(expiration == 0)
- {
- expiration = System.currentTimeMillis() + TIMEOUT;
- }
- cacheEntry.setExpiration(expiration);
- }
-
- }
- catch(Exception e)
- {
- // Do nothing.
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing if the stream cannot be closed.
- }
- }
- if(os != null)
- {
- try
- {
- os.close();
- }
- catch(IOException e)
- {
- // Do nothing if the stream cannot be closed.
- }
- }
- }
- return cacheEntry;
- }
-
- /**
- * Get an array of the cached URIs.
- *
- * @return An array of the cached URIs.
- */
- public String[] getCachedURIs()
- {
- Set keyset = cache.keySet();
- return (String[])keyset.toArray(new String[keyset.size()]);
- }
-
- /**
- * Close the cache. Closing the cache involves serializing the data to an XML file
- * in the plugin state location.
- */
- protected void close()
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try {
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document cachedoc = builder.newDocument();
- Element rootelem = cachedoc.createElement(CACHE);
- cachedoc.appendChild(rootelem);
-
- Enumeration uris = cache.keys();
- while(uris.hasMoreElements())
- {
- String key = (String)uris.nextElement();
- CacheEntry cacheEntry = (CacheEntry)cache.get(key);
- if(cacheEntry != null)
- {
- Element entry = cachedoc.createElement(ENTRY);
- entry.setAttribute(URI, key);
- entry.setAttribute(LOCATION, cacheEntry.getLocalFile());
- entry.setAttribute(EXPIRATION_TIME, String.valueOf(cacheEntry.getExpirationTime()));
- entry.setAttribute(LAST_MODIFIED, String.valueOf(cacheEntry.getLastModified()));
- rootelem.appendChild(entry);
- }
- }
-
- // Write the cache entry.
- TransformerFactory tFactory = TransformerFactory.newInstance();
- Transformer transformer = tFactory.newTransformer();
- Source input = new DOMSource(cachedoc);
- IPath stateLocation = Platform.getStateLocation(CachePlugin.getDefault().getBundle());
- Result output = new StreamResult(stateLocation.toString() + "/" + CACHE_FILE);
- transformer.transform(input, output);
-
- }catch(Exception e)
- {
- System.out.println("Unable to store internet cache.");
- }
- cacheInstance = null;
- }
-
- /**
- * Open the cache. Opening the cache involves parsing the cache XML file in
- * the plugin state location if it can be read.
- */
- protected static void open(IPath cacheLocation)
- {
- cacheInstance = new Cache(cacheLocation);
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try {
-
- IPath stateLocation = cacheLocation;
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document cachedoc = builder.parse(stateLocation.toString() + "/" + CACHE_FILE);
- Element rootelem = cachedoc.getDocumentElement();
- NodeList entries = rootelem.getChildNodes();
- int numEntries = entries.getLength();
- for(int i = 0; i < numEntries; i++)
- {
- Node entry = entries.item(i);
- if(entry instanceof Element)
- {
- Element e = (Element)entry;
- if(e.getNodeName().equals(ENTRY))
- {
- String uri = e.getAttribute(URI);
- String location = e.getAttribute(LOCATION);
- String lm = e.getAttribute(LAST_MODIFIED);
- String et = e.getAttribute(EXPIRATION_TIME);
- long lastModified = -1;
- long expirationTime = -1;
- try
- {
- lastModified = Long.parseLong(lm);
- }
- catch(NumberFormatException nfe)
- {
- }
- try
- {
- expirationTime = Long.parseLong(et);
- }
- catch(NumberFormatException nfe)
- {
- }
- if(uri != null && location != null)
- {
- cacheInstance.cache.put(uri, new CacheEntry(uri, location, lastModified, expirationTime));
- }
- }
- }
- }
- }
- catch(FileNotFoundException e)
- {
- // If the file doesn't exist in the correct location there is nothing to load. Do nothing.
- }
- catch(Exception e)
- {
- System.out.println("Unable to load cache.");
- }
- }
-
- /**
- * Clear all of the entries from the cache. This method also deletes the cache files.
- */
- public void clear()
- {
- Enumeration keys = cache.keys();
- while(keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
-
- deleteFile(key);
- }
- cache.clear();
- }
-
- /**
- * Delete the cache entry specified by the given URI.
- * @param uri The URI entry to remove from the catalog.
- */
- public void deleteEntry(String uri)
- {
- if(uri == null) return;
-
- deleteFile(uri);
- cache.remove(uri);
- }
-
- /**
- * Delete the file specified by the URI.
- *
- * @param uri The URI of the file to delete.
- */
- protected void deleteFile(String uri)
- {
- CacheEntry cacheEntry = (CacheEntry)cache.get(uri);
- if(cacheEntry != null)
- {
- String location = cacheLocation.toString() + "/" + cacheEntry.getLocalFile();
- File file = new File(location);
- if(!file.delete())
- {
- System.out.println("Unable to delete file " + location + " from cache.");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheEntry.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheEntry.java
deleted file mode 100644
index 817ec06..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheEntry.java
+++ /dev/null
@@ -1,114 +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.internet.cache.internal;
-
-/**
- * A cache entry contains a URI, a local file, and a timeout.
- */
-public class CacheEntry
-{
- private String uri;
- private String localFile;
- private long lastModified;
- private long expirationTime;
-
- /**
- * Create a new cache entry.
- *
- * @param uri The remote URI of the cache entry.
- * @param localFile The local file that contains the cached entry.
- * @param lastModifie The time this resource was last modified.
- * @param expirationTime The time in miliseconds that this cache entry will
- * expire.
- */
- public CacheEntry(String uri, String localFile, long lastModified, long expirationTime)
- {
- this.uri = uri;
- this.localFile = localFile;
- this.lastModified = lastModified;
- this.expirationTime = expirationTime;
- }
-
- /**
- * The cache entry is expired if its expiration time is less then the
- * current system time and not equal to -1.
- *
- * @return True if this cached entry has expired, false otherwise.
- */
- public boolean hasExpired()
- {
- if(expirationTime != -1 && System.currentTimeMillis() > expirationTime)
- {
- return true;
- }
- return false;
- }
-
- /**
- * Set the time in miliseconds that this cache entry will expire.
- *
- * @param timeout The time in miliseconds that this cache entry will expire.
- * -1 indicates that this entry will not expire.
- */
- public void setExpiration(long expirationTime)
- {
- this.expirationTime = expirationTime;
- }
-
- /**
- * Get the time at which this cache entry will expire.
- *
- * @return The time at which this cache entry will expire.
- */
- public long getExpirationTime()
- {
- return expirationTime;
- }
-
- /**
- * Get the remote URI for this cache entry.
- *
- * @return The remote URI for this cache entry.
- */
- public String getURI()
- {
- return uri;
- }
-
- /**
- * Get the local file for this cache entry.
- *
- * @return The local file for this cache entry.
- */
- public String getLocalFile()
- {
- return localFile;
- }
-
- /**
- * Get the last time this cache entry was modified.
- *
- * @return The last time this cache entry was modified.
- */
- public long getLastModified()
- {
- return lastModified;
- }
-
- /**
- * Set the last time this cache entry was modified.
- */
- public void setLastModified(long lastModified)
- {
- this.lastModified = lastModified;
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheJob.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheJob.java
deleted file mode 100644
index 34c3943..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheJob.java
+++ /dev/null
@@ -1,127 +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.internet.cache.internal;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * A cache job runs once an hour to cache any prespecified resources which
- * should be cached and any resources for which an attempt was previously
- * made to cache them but they were unable to be cached.
- */
-public class CacheJob extends Job
-{
- private static final long SCHEDULE_TIME = 3600000;
-
- private static CacheJob job = null;
- /**
- * Constructor.
- */
- public CacheJob()
- {
- super(CacheMessages._UI_CACHE_MONITOR_NAME);
- }
-
- /**
- * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected IStatus run(IProgressMonitor monitor)
- {
- boolean allSuccessful = true;
- Cache cache = Cache.getInstance();
- String[] uncachedURIs = cache.getUncachedURIs();
- int numUncachedURIs = uncachedURIs.length;
-
- cache.clearUncachedURIs();
- monitor.beginTask(CacheMessages._UI_CACHE_MONITOR_NAME, numUncachedURIs);
- try
- {
- for(int i = 0; i < numUncachedURIs; i++)
- {
- if (monitor.isCanceled())
- {
- for(int j = i; j < numUncachedURIs; j++)
- {
- cache.addUncachedURI(uncachedURIs[j]);
- }
- return Status.CANCEL_STATUS;
- }
- String uri = uncachedURIs[i];
- monitor.setTaskName(MessageFormat.format(CacheMessages._UI_CACHE_MONITOR_CACHING, new Object[]{uri}));
-
- String cachedURI = cache.getResource(uri);
- if(cachedURI == null)
- {
- allSuccessful = false;
- }
- monitor.worked(1);
- }
- monitor.done();
- return Status.OK_STATUS;
- }
- finally
- {
- // If all the uncached URIs could not be cached
- // schedule the next time the job should run.
- if(!allSuccessful)
- {
- startJob(SCHEDULE_TIME);
- }
- }
- }
-
- /**
- * Start the cache job. The cache job caches resources that were not able to be previously
- * downloaded. Only one job is run at a time.
- */
- protected static void startJob()
- {
- if(job == null)
- {
- startJob(0);
- }
- }
-
- /**
- * Start a new cache job with the specified delay.
- *
- * @param delay
- * The start delay for the cache job.
- */
- private static void startJob(long delay)
- {
- job = new CacheJob();
- job.setPriority(CacheJob.DECORATE);
- job.schedule(delay); // start as soon as possible
- }
-
- /**
- * Stop the current cache job. The cache job caches resources that were not able to be previously
- * downloaded.
- */
- protected static void stopJob()
- {
- if (job != null)
- {
- job.cancel();
- }
- job = null;
- }
-
-}
-
-
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheMessages.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheMessages.java
deleted file mode 100644
index f8fee2f..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheMessages.java
+++ /dev/null
@@ -1,58 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- */
-package org.eclipse.wst.internet.cache.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by the cache.
- */
-public class CacheMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.internet.cache.internal.CachePluginResources";//$NON-NLS-1$
-
- public static String _UI_CONFIRM_CLEAR_CACHE_DIALOG_TITLE;
- public static String _UI_CONFIRM_CLEAR_CACHE_DIALOG_MESSAGE;
- public static String _UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_TITLE;
- public static String _UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_MESSAGE;
- public static String _UI_BUTTON_CLEAR_CACHE;
- public static String _UI_BUTTON_DELETE_ENTRY;
- public static String _UI_PREF_CACHE_ENTRIES_TITLE;
- public static String _UI_PREF_CACHE_CACHE_OPTION;
- public static String _UI_PREF_CACHE_ABOUT;
- public static String _UI_PREF_PROMPT_FOR_DISAGREED_LICENSES;
- public static String _UI_CACHE_MONITOR_NAME;
- public static String _UI_CACHE_MONITOR_CACHING;
-
- // Cache license dialog
- public static String _UI_CACHE_DIALOG_LICENSE_STATEMENT1;
- public static String _UI_CACHE_DIALOG_LICENSE_STATEMENT2;
- public static String _UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_INTERNAL;
- public static String _UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_BROWSER;
- public static String _UI_CACHE_DIALOG_AGREE_BUTTON;
- public static String _UI_CACHE_DIALOG_DISAGREE_BUTTON;
- public static String _UI_CACHE_DIALOG_TITLE;
- public static String _UI_LOADING_LICENSE;
-
- // Cache logging messages
- public static String _LOG_INFO_WTP_NO_USER_INTERACTION;
-
- // WTP test no user interaction system property
- public static String WTP_NO_USER_INTERACTION_SYSTEM_PROP;
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, CacheMessages.class);
- }
-
- private CacheMessages() {
- // cannot create new instance
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePlugin.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePlugin.java
deleted file mode 100644
index 704f0e0..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePlugin.java
+++ /dev/null
@@ -1,165 +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.internet.cache.internal;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.internet.cache.internal.preferences.PreferenceConstants;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CachePlugin extends AbstractUIPlugin
-{
- /**
- * The ID of this plugin.
- */
- public static final String PLUGIN_ID = "org.eclipse.wst.internet.cache";
-
- /**
- * The shared instance.
- */
- private static CachePlugin plugin;
-
- /**
- * The constructor.
- */
- public CachePlugin()
- {
- super();
- plugin = this;
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- ToCacheRegistryReader.getInstance().readRegistry();
- Cache.open(Platform.getStateLocation(getBundle()));
- if (getPluginPreferences().contains(PreferenceConstants.CACHE_ENABLED))
- {
- setCacheEnabled(getPluginPreferences().getBoolean(PreferenceConstants.CACHE_ENABLED));
- }
- else
- {
- // The cache is disabled by default.
- setCacheEnabled(false);
- }
-
- // Restore license preferences
- Preferences prefs = getPluginPreferences();
- LicenseRegistry registry = LicenseRegistry.getInstance();
- String[] licenses = registry.getLicenses();
- int numLicenses = licenses.length;
- for(int i = 0; i < numLicenses; i++)
- {
- int state = prefs.getInt(licenses[i]);
- if(state == LicenseRegistry.LICENSE_AGREE.intValue())
- {
- registry.agreeLicense(licenses[i]);
- }
- else if(state == LicenseRegistry.LICENSE_DISAGREE.intValue())
- {
- registry.disagreeLicense(licenses[i]);
- }
- }
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- // Save the license state information.
- Preferences prefs = getPluginPreferences();
- LicenseRegistry registry = LicenseRegistry.getInstance();
- String[] licenses = registry.getLicenses();
- int numLicenses = licenses.length;
- for(int i = 0; i < numLicenses; i++)
- {
- Integer state = registry.getLicenseState(licenses[i]);
- // For states that have been disagreed to this session store
- // them as disagree.
- if(state == LicenseRegistry.LICENSE_DISAGREE_THIS_SESSION)
- {
- state = LicenseRegistry.LICENSE_DISAGREE;
- }
- prefs.setValue(licenses[i], state.intValue());
- }
-
- Cache.getInstance().close();
- CacheJob.stopJob();
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- *
- * @return The shared instance.
- */
- public static CachePlugin getDefault()
- {
- return plugin;
- }
-
- /**
- * Set whether or not the cache is enabled.
- *
- * @param enabled If true the cache is enabled, if false it is not enabled.
- */
- public void setCacheEnabled(boolean enabled)
- {
- getPluginPreferences().setValue(PreferenceConstants.CACHE_ENABLED, enabled);
- CacheJob.stopJob();
- }
-
- /**
- * Returns true if the cache is enabled, false otherwise.
- *
- * @return True if the cache is enabled, false otherwise.
- */
- public boolean isCacheEnabled()
- {
- if (getPluginPreferences().contains(PreferenceConstants.CACHE_ENABLED))
- return getPluginPreferences().getBoolean(PreferenceConstants.CACHE_ENABLED);
- return true;
- }
-
- /**
- * Set whether or not the user should be prompted for licenses to which they
- * have previously disagreed.
- *
- * @param prompt If true the the user should be prompted, if false the user should not be prompted.
- */
- public void setPromptDisagreedLicenses(boolean prompt)
- {
- getPluginPreferences().setValue(PreferenceConstants.PROMPT_DISAGREED_LICENSES, prompt);
- }
-
- /**
- * Returns true if the the user should be prompted for licenses to which they
- * have previously disagreed, false otherwise.
- *
- * @return True if the user should be prompted, false otherwise.
- */
- public boolean shouldPrompt()
- {
- if (getPluginPreferences().contains(PreferenceConstants.PROMPT_DISAGREED_LICENSES))
- return getPluginPreferences().getBoolean(PreferenceConstants.PROMPT_DISAGREED_LICENSES);
- return true;
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
deleted file mode 100644
index fe850d6..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CachePluginResources.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-# Cache preference page strings.
-_UI_CONFIRM_CLEAR_CACHE_DIALOG_TITLE = Remove All?
-_UI_CONFIRM_CLEAR_CACHE_DIALOG_MESSAGE = Remove all cache entries?
-_UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_TITLE = Remove Entries?
-_UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_MESSAGE = Remove all selected cache entries?
-_UI_BUTTON_CLEAR_CACHE = Remove &All
-_UI_BUTTON_DELETE_ENTRY = &Remove
-_UI_PREF_CACHE_ENTRIES_TITLE = &Cache entries:
-_UI_PREF_CACHE_CACHE_OPTION = &Disable caching
-_UI_PREF_CACHE_ABOUT = Manage the cache of remote resources, such as those downloaded from the internet.
-_UI_PREF_PROMPT_FOR_DISAGREED_LICENSES = &Prompt me for agreement for licenses for whose terms I have already disagreed.
-
-# Cache monitor strings.
-_UI_CACHE_MONITOR_NAME = Caching Remote Resources
-_UI_CACHE_MONITOR_CACHING = Caching {0}
-
-# Cache license dialog
-_UI_CACHE_DIALOG_LICENSE_STATEMENT1 = A request has been made to cache the resource:
-_UI_CACHE_DIALOG_LICENSE_STATEMENT2 = In order to cache the resource you must agree to the license below:
-_UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_INTERNAL = In order to cache the resource you must agree to the license which has been opened in your browser.
-_UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_BROWSER = The license cannot be displayed in this dialog. In order to cache the resource you must agree to the license located at {0}.
-_UI_CACHE_DIALOG_AGREE_BUTTON = I Agree
-_UI_CACHE_DIALOG_DISAGREE_BUTTON = I Disagree
-_UI_CACHE_DIALOG_TITLE = License Agreement
-_UI_LOADING_LICENSE = Loading license
-
-# Cache logging messages
-_LOG_INFO_WTP_NO_USER_INTERACTION = {0} is set. Licenses dialogs will not be displayed.
-
-# WTP test no user interaction system property
-# This property is checked by the cache. This sting is not shown to the user.
-WTP_NO_USER_INTERACTION_SYSTEM_PROP = wtp.autotest.noninteractive
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtension.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtension.java
deleted file mode 100644
index f6518f2..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtension.java
+++ /dev/null
@@ -1,50 +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.internet.cache.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-
-/**
- * A cache URI resolver. This resolver will cache remote resources and return
- * the local copy if they can be cached. If a resource cannot be cached the
- * resource returns null.
- */
-public class CacheURIResolverExtension implements URIResolverExtension
-{
- /**
- * @see org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension#resolve(org.eclipse.core.resources.IProject, java.lang.String, java.lang.String, java.lang.String)
- */
- public String resolve(IFile file, String baseLocation, String publicId, String systemId)
- {
- if(CachePlugin.getDefault().isCacheEnabled())
- {
- String resource = null;
- if(systemId != null)
- {
- resource = URIHelper.normalize(systemId, baseLocation, null);
- }
-
- if(resource != null && (resource.startsWith("http:") || resource.startsWith("ftp:")))
- {
- // Handle resources prespecified to cache.
- ToCacheResource toCacheResource = ToCacheRegistryReader.getInstance().getResourceToCache(resource);
- if(toCacheResource == null || LicenseRegistry.getInstance().hasLicenseBeenAccepted(resource, toCacheResource.getLicense()))
- {
- return Cache.getInstance().getResource(resource);
- }
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java
deleted file mode 100644
index d9bc3c1..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java
+++ /dev/null
@@ -1,345 +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.internet.cache.internal;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-
-import org.eclipse.jface.dialogs.IconAndMessageDialog;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.ProgressEvent;
-import org.eclipse.swt.browser.ProgressListener;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A dialog that prompts the user to accept a license agreement.
- */
-public class LicenseAcceptanceDialog extends IconAndMessageDialog
-{
- /**
- * Holds all the dialogs that are currently displayed keyed by the license URL.
- */
- private static Hashtable dialogsInUse = new Hashtable();
-
- /**
- * The URL of the resource.
- */
- private String url;
-
- /**
- * The URL of the license.
- */
- private String licenseURL;
-
- /**
- * The agree button for the dialog.
- */
- private Button agreeButton = null;
-
- /**
- * Constructor.
- *
- * @param parent The parent of this dialog.
- * @param url The license URL.
- */
- protected LicenseAcceptanceDialog(Shell parent, String url, String licenseURL)
- {
- super(parent);
- this.url = url;
- this.licenseURL = licenseURL;
- }
-
- /**
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(CacheMessages._UI_CACHE_DIALOG_TITLE);
- shell.setImage(null);
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
- */
- protected Control createButtonBar(Composite parent)
- {
- Composite buttonBar = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 0;
- layout.makeColumnsEqualWidth = true;
- buttonBar.setLayout(layout);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
- buttonBar.setLayoutData(gd);
-
- // Create the agree button.
- agreeButton = createButton(buttonBar, LicenseAcceptanceDialog.OK,
- CacheMessages._UI_CACHE_DIALOG_AGREE_BUTTON, false);
- agreeButton.setEnabled(false);
-
- // Create the disagree button.
- createButton(buttonBar, LicenseAcceptanceDialog.CANCEL,
- CacheMessages._UI_CACHE_DIALOG_DISAGREE_BUTTON, false);
-
- return buttonBar;
- }
-
- /**
- * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent)
- {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- GridData gd = new GridData(SWT.FILL);
- gd.widthHint = 500;
- composite.setLayoutData(gd);
-
- // Display a statement about the license.
- Label licenseText1 = new Label(composite, SWT.NONE);
- licenseText1.setText(CacheMessages._UI_CACHE_DIALOG_LICENSE_STATEMENT1);
- Label urlText = new Label(composite, SWT.WRAP);
- gd = new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1);
- urlText.setLayoutData(gd);
- urlText.setText(url);
- new Label(composite, SWT.NONE); // Spacing label.
- Label licenseText2 = new Label(composite, SWT.WRAP);
- gd = new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1);
- licenseText2.setLayoutData(gd);
-
- // Display the license in a browser.
- try
- {
- final Composite licenseTextComposite = new Composite(composite, SWT.NONE);
- final StackLayout stackLayout = new StackLayout();
- licenseTextComposite.setLayout(stackLayout);
- gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd.heightHint = 400;
- licenseTextComposite.setLayoutData(gd);
- // Create the loading progress monitor composite and part.
- Composite monitorComposite = new Composite(licenseTextComposite, SWT.NONE);
- monitorComposite.setLayout(new GridLayout());
- gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd.heightHint = 400;
- monitorComposite.setLayoutData(gd);
- final ProgressMonitorPart monitor = new ProgressMonitorPart(monitorComposite, new GridLayout());
- gd = new GridData(SWT.FILL, SWT.BOTTOM, true, true);
- monitor.setLayoutData(gd);
- monitor.beginTask(CacheMessages._UI_LOADING_LICENSE, 100);
- stackLayout.topControl = monitorComposite;
- // Create the browser.
- final Browser browser = new Browser(licenseTextComposite, SWT.BORDER);
- gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- //gd.heightHint = 400;
-
- // It's important that the license URL is set even if we read
- // the contents of the license file ourselves (see below) as
- // otherwise the progress monitor will not be called on certain
- // linux systems with certain browsers.
- browser.setUrl(licenseURL);
-
- // The browser widget has problems loading files stored in jars
- // so we read from the jar and set the browser text ourselves.
- // See bug 154721.
- if(licenseURL.startsWith("jar:"))
- {
- InputStream licenseStream = null;
- InputStreamReader isreader = null;
- BufferedReader breader = null;
- try
- {
- URL browserURL = new URL(licenseURL);
- licenseStream = browserURL.openStream();
- isreader = new InputStreamReader(licenseStream);
- breader = new BufferedReader(isreader);
- String str;
- StringBuffer sb = new StringBuffer();
- while((str = breader.readLine())!=null){
- sb.append(str);
- }
- browser.setText(sb.toString());
- }
- finally
- {
- if(licenseStream != null)
- {
- licenseStream.close();
- }
- if(isreader != null)
- {
- isreader.close();
- }
- if(breader != null)
- {
- breader.close();
- }
- }
- }
-
- browser.setLayoutData(gd);
- browser.addProgressListener(new ProgressListener(){
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.browser.ProgressListener#changed(org.eclipse.swt.browser.ProgressEvent)
- */
- public void changed(ProgressEvent event)
- {
- if (event.total != 0)
- {
- monitor.internalWorked(event.current * 100 / event.total);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.browser.ProgressListener#completed(org.eclipse.swt.browser.ProgressEvent)
- */
- public void completed(ProgressEvent event)
- {
- monitor.done();
-
- stackLayout.topControl = browser;
- agreeButton.setEnabled(true);
- licenseTextComposite.layout();
- }
- });
-
- licenseText2.setText(CacheMessages._UI_CACHE_DIALOG_LICENSE_STATEMENT2);
- }
- catch(Exception e)
- {
- // The browser throws an exception on platforms that do not support it.
- // In this case we need to create an external browser.
- try
- {
- CachePlugin.getDefault().getWorkbench().getBrowserSupport().getExternalBrowser().openURL(new URL(licenseURL));
- licenseText2.setText(CacheMessages._UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_INTERNAL);
- }
- catch(Exception ex)
- {
- // In this case the license cannot be display. Inform the user of this and give them the license location.
- licenseText2.setText(MessageFormat.format(CacheMessages._UI_CACHE_DIALOG_LICENSE_STATEMENT2_NO_BROWSER, new Object[]{licenseURL}));
- }
- }
-
- createButtonBar(composite);
-
- return composite;
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
- */
- protected Image getImage()
- {
- return getInfoImage();
- }
-
- /**
- * Prompt the user to accept the specified license. This method creates the
- * dialog and returns the result.
- *
- * @param parent The parent of this dialog.
- * @param url The URL of the resource for which the license must be accepted.
- * @param licenseURL The license URL.
- * @return True if the license is accepted, false otherwise.
- */
- public static boolean promptForLicense(Shell parent, String url, String licenseURL) throws IOException
- {
- boolean agreedToLicense = false;
- boolean newDialog = true;
- LicenseAcceptanceDialog dialog = null;
- // If the dialog is already displayed for this license use it instead of
- // displaying another dialog.
- if(dialogsInUse.containsKey(licenseURL))
- {
- newDialog = false;
- dialog = (LicenseAcceptanceDialog)dialogsInUse.get(licenseURL);
- }
- else
- {
- InputStream is = null;
-
- try
- {
- URL urlObj = new URL(licenseURL);
- is = urlObj.openStream();
-
- dialog = new LicenseAcceptanceDialog(parent, url, licenseURL);
- dialogsInUse.put(licenseURL, dialog);
- dialog.setBlockOnOpen(true);
- }
- catch(Exception e)
- {
- throw new IOException("The license cannot be opened.");
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- }
- if(dialog != null)
- {
- dialog.open();
-
- if (dialog.getReturnCode() == LicenseAcceptanceDialog.OK)
- {
- agreedToLicense = true;
- }
-
- if(newDialog)
- {
- dialogsInUse.remove(licenseURL);
- }
- }
-
- return agreedToLicense;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#close()
- */
- public boolean close()
- {
- if(agreeButton != null)
- {
- agreeButton.dispose();
- agreeButton = null;
- }
- return super.close();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java
deleted file mode 100644
index 2ffb248..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseRegistry.java
+++ /dev/null
@@ -1,249 +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.internet.cache.internal;
-
-import java.text.MessageFormat;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * The license registry holds all of the registered licenses and whether or not they
- * have been accepted.
- */
-public class LicenseRegistry
-{
- protected static Integer LICENSE_UNSPECIFIED = new Integer(0); // This needs to be 0 for the plugin prefs.
- protected static Integer LICENSE_AGREE = new Integer(1);
- protected static Integer LICENSE_DISAGREE = new Integer(2);
- // Signifies a license that has been disagreed to this session.
- protected static Integer LICENSE_DISAGREE_THIS_SESSION = new Integer(3);
-
- /**
- * There is only one instance of the license registry.
- */
- protected static LicenseRegistry instance = null;
-
- /**
- * If set to true, the do not prompt flag will prevent user prompting. Used for automated testing.
- */
- private boolean DO_NOT_PROMPT = false;
-
- /**
- * The licenses hashtable contains licenses and whether or not they've been accepted.
- */
- protected Hashtable licenses;
-
- protected LicenseRegistry()
- {
- licenses = new Hashtable();
-
- // If the wtp quiet system property is set the DO_NOT_PROMPT flag is set to true.
- // This is used for automated testing.
- if(System.getProperty(CacheMessages.WTP_NO_USER_INTERACTION_SYSTEM_PROP, "false").equals("true"))
- {
- CachePlugin.getDefault().getLog().log(new Status(IStatus.INFO, CachePlugin.PLUGIN_ID, IStatus.OK, MessageFormat.format(CacheMessages._LOG_INFO_WTP_NO_USER_INTERACTION, new Object[]{CacheMessages.WTP_NO_USER_INTERACTION_SYSTEM_PROP}), null));
- DO_NOT_PROMPT = true;
- }
- }
-
- /**
- * Get the one and only instance of the license registry.
- *
- * @return The one and only instance of the license registry.
- */
- public static LicenseRegistry getInstance()
- {
- if(instance == null)
- {
- instance = new LicenseRegistry();
- }
- return instance;
- }
-
- /**
- * Add the specified license to the license registry. A license can only be added to the
- * registry once.
- *
- * @param url The URL of the license to add to the registry.
- */
- public void addLicense(String url)
- {
- if(url != null && !licenses.containsKey(url))
- {
- licenses.put(url, LICENSE_UNSPECIFIED);
- }
- }
-
- /**
- * Agree to the specified license. The license is agreed to only if it has already
- * been registered with the registry.
- *
- * @param url The URL of the license to accept.
- */
- protected void agreeLicense(String url)
- {
- if(licenses.containsKey(url))
- {
- licenses.put(url, LICENSE_AGREE);
- }
- }
-
- /**
- * Disagree to the specified license. The license is disagreed to only if it has already
- * been registered with the registry.
- *
- * @param url The URL of the license to accept.
- */
- protected void disagreeLicense(String url)
- {
- if(licenses.containsKey(url))
- {
- licenses.put(url, LICENSE_DISAGREE);
- }
- }
-
- /**
- * Disagree to the specified license for this session. The license is disagreed to only if it has already
- * been registered with the registry.
- *
- * @param url The URL of the license to accept.
- */
- private void disagreeLicenseThisSession(String url)
- {
- if(licenses.containsKey(url))
- {
- licenses.put(url, LICENSE_DISAGREE_THIS_SESSION);
- }
- }
-
- /**
- * Determine if the license has been accepted. This method will return true if the license
- * has been accepted or is not registered with the registry and false if it has not been accepted.
- *
- * @param url The URL of the resource for which we are checking the license.
- * @param licenseURL The URL of the license that should be checked to see if it has been accepted.
- * @return True if the license has been accepted or is not registered with the registry, false otherwise.
- */
- public boolean hasLicenseBeenAccepted(String url, String licenseURL)
- {
- if(DO_NOT_PROMPT)
- {
- return true;
- }
-
- if(licenses.containsKey(licenseURL))
- {
- Integer agreed = (Integer)licenses.get(licenseURL);
- if(agreed == LICENSE_AGREE)
- {
- return true;
- }
- else if(agreed == LICENSE_DISAGREE)
- {
- if(!CachePlugin.getDefault().shouldPrompt())
- return false;
- licenses.put(licenseURL, LICENSE_DISAGREE_THIS_SESSION);
- }
- // The license has already been disagreed to this session. Do not prompt.
- else if(agreed == LICENSE_DISAGREE_THIS_SESSION)
- {
- return false;
- }
-
-
- // Prompt the user to accept the license.
- int licenseAcceptance = promptToAcceptLicense(url, licenseURL);
- if(licenseAcceptance == Accepted.ACCEPTED)
- {
- agreeLicense(licenseURL);
- return true;
- }
- else if(licenseAcceptance == Accepted.NOT_ACCEPTED)
- {
- disagreeLicenseThisSession(licenseURL);
- return false;
- }
- return false;
- }
-
- // The license is not registred with the registry.
- return true;
- }
-
- /**
- * Prompt the user to accept the license. This method creates a LicenseAcceptanceDialog.
- *
- * @param url The URL of the resource for which the license needs to be accepted.
- * @param licenseURL The URL of the license to be accepted.
- * @return 0 if accepted, 1 if not accepted, 2 if not able to accept.
- */
- protected int promptToAcceptLicense(final String url, final String licenseURL)
- {
- final Accepted accepted = new Accepted();
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try
- {
- if(LicenseAcceptanceDialog.promptForLicense(null, url, licenseURL))
- {
- accepted.accepted = Accepted.ACCEPTED;
- }
- else
- {
- accepted.accepted = Accepted.NOT_ACCEPTED;
- }
- }
- catch(Exception e)
- {
- accepted.accepted = Accepted.NOT_DETERMINED;
- }
- }
- });
- return accepted.accepted;
- }
-
- /**
- * Get an array containing all the licenses in the registry.
- *
- * @return As array containing all the licenses in the registry.
- */
- protected String[] getLicenses()
- {
- return (String[])licenses.keySet().toArray(new String[licenses.keySet().size()]);
- }
-
- /**
- * Get the state of the license.
- *
- * @param url The URL of the license.
- * @return The state of the license.
- */
- protected Integer getLicenseState(String url)
- {
- return (Integer)licenses.get(url);
- }
-
-
- /**
- * A class to hold acceptance information for the prompt method.
- */
- private class Accepted
- {
- public static final int ACCEPTED = 0;
- public static final int NOT_ACCEPTED = 1;
- public static final int NOT_DETERMINED = 2;
- public int accepted = NOT_ACCEPTED;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheRegistryReader.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheRegistryReader.java
deleted file mode 100644
index 73165b2..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheRegistryReader.java
+++ /dev/null
@@ -1,147 +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.internet.cache.internal;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * The ToCacheRegistryReaders reads Eclipse extensions which specify
- * resources to cache. An extension point looks like the following.
- *
- * <extension point="org.eclipse.wst.internet.cache.cacheresource">
- * <cacheresource uri="URI_TO_CACHE" license="URI_OF_LICENSE"/>
- * </extension>
- *
- */
-public class ToCacheRegistryReader
-{
- protected static final String PLUGIN_ID = "org.eclipse.wst.internet.cache";
- protected static final String EXTENSION_POINT_ID = "cacheresource";
- protected static final String ATT_URL = "url";
- protected static final String ATT_LICENSE = "license";
-
- private static ToCacheRegistryReader registryReader = null;
-
- private Hashtable resourcesToCache = new Hashtable();
-
- /**
- * Get the one and only instance of this registry reader.
- *
- * @return The one and only instance of this registry reader.
- */
- public static ToCacheRegistryReader getInstance()
- {
- if(registryReader == null)
- {
- registryReader = new ToCacheRegistryReader();
- }
- return registryReader;
- }
- /**
- * Read from plugin registry and handle the configuration elements that match
- * the spedified elements.
- */
- public void readRegistry()
- {
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- ToCacheResource toCacheResource = readElement(elements[i]);
- if(toCacheResource != null)
- {
- resourcesToCache.put(toCacheResource.getURL(), toCacheResource);
- LicenseRegistry.getInstance().addLicense(toCacheResource.getLicense());
- }
- }
- }
- }
-
- /**
- * Parse and deal with the extension points.
- *
- * @param element The extension point element.
- */
- protected ToCacheResource readElement(IConfigurationElement element)
- {
-
- if(element.getName().equals(EXTENSION_POINT_ID))
- {
- String url = element.getAttribute(ATT_URL);
- if(url != null)
- {
- String license = element.getAttribute(ATT_LICENSE);
-
- // If the license is relative resolve relative to the
- // plug-in that declares it.
- try
- {
- URI licenseURI = new URI(license);
- if(!licenseURI.isAbsolute())
- {
- Bundle pluginBundle = Platform.getBundle(element.getDeclaringExtension().getContributor().getName());
- URL licenseURL = pluginBundle.getEntry(license);
- if(licenseURL != null)
- {
- license = FileLocator.resolve(licenseURL).toExternalForm();
- }
- }
- }
- catch(URISyntaxException e)
- {
- // Use the license as specified.
- }
- catch(IOException e)
- {
- // Use the license as specified.
- }
- return new ToCacheResource(url, license);
- }
- }
- return null;
- }
-
- /**
- * Get the list of URIs that have been specified for caching.
- *
- * @return The list of URIs that have been specified for caching.
- */
- public String[] getURIsToCache()
- {
- return (String[])resourcesToCache.keySet().toArray(new String[resourcesToCache.size()]);
- }
-
- /**
- * Get the resource to cache if one has been specified.
- *
- * @param url The URL of the resource to cache.
- * @return A ToCacheResource object representing the URL or null if none has been specified.
- */
- public ToCacheResource getResourceToCache(String url)
- {
- return (ToCacheResource)resourcesToCache.get(url);
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheResource.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheResource.java
deleted file mode 100644
index 3f6778b..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/ToCacheResource.java
+++ /dev/null
@@ -1,53 +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.internet.cache.internal;
-
-/**
- * A resource that is specified to be cached. The resource has a URL and an optional
- * license.
- */
-public class ToCacheResource
-{
- private String url;
- private String license;
-
- /**
- * Constructor.
- *
- * @param url The URL of the resource to be cached.
- * @param license The URL of the optional license for this resource.
- */
- public ToCacheResource(String url, String license)
- {
- this.url = url;
- this.license = license;
- }
-
- /**
- * Get the URL of the resource to be cached.
- *
- * @return The URL of the resource to be cached.
- */
- public String getURL()
- {
- return url;
- }
-
- /**
- * Get the license URL of the resource to be cached.
- *
- * @return The license URL of the resource to be cached.
- */
- public String getLicense()
- {
- return license;
- }
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java
deleted file mode 100644
index 4ac9667..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java
+++ /dev/null
@@ -1,303 +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.internet.cache.internal.preferences;
-
-import java.util.Arrays;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.internet.cache.internal.Cache;
-import org.eclipse.wst.internet.cache.internal.CacheMessages;
-import org.eclipse.wst.internet.cache.internal.CachePlugin;
-
-/**
- * This class represents a preference page that is contributed to the
- * Preferences dialog. This page contains options for the cache. The cache can
- * be disabled, the list of entries in the cache can be viewed, and individual
- * entries or the entire cache can be deleted.
- */
-
-public class CachePreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage
-{
- protected Button clearButton;
-
- protected Button deleteButton;
-
- protected Button enabledButton;
-
- protected Button disagreedLicensesButton;
-
- protected List entries;
-
- protected Composite composite = null;
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- public void dispose()
- {
- if (composite != null)
- {
- composite.dispose();
- }
- super.dispose();
- }
-
- /**
- * Constructor.
- */
- public CachePreferencePage()
- {
- setPreferenceStore(CachePlugin.getDefault().getPreferenceStore());
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench)
- {
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent)
- {
- noDefaultAndApplyButton();
-
- composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(4);
- layout.verticalSpacing = convertVerticalDLUsToPixels(3);
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
- composite.setLayoutData(gd);
-
- Label aboutLabel = new Label(composite, SWT.WRAP);
- aboutLabel.setText(CacheMessages._UI_PREF_CACHE_ABOUT);
- GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gridData.horizontalSpan = 2;
- aboutLabel.setLayoutData(gridData);
- new Label(composite, SWT.None);
- try
- {
- // Created the disable cache option.
- enabledButton = new Button(composite, SWT.CHECK | SWT.LEFT);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gridData.horizontalSpan = 2;
- enabledButton.setLayoutData(gridData);
- enabledButton.setText(CacheMessages._UI_PREF_CACHE_CACHE_OPTION);
- enabledButton.setSelection(!CachePlugin.getDefault().getPreferenceStore()
- .getBoolean(PreferenceConstants.CACHE_ENABLED));
- enabledButton.addSelectionListener(new SelectionListener()
- {
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- widgetSelected(e);
-
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- boolean disabled = enabledButton.getSelection();
- CachePlugin.getDefault().setCacheEnabled(!disabled);
- }
-
- });
-
- disagreedLicensesButton = new Button(composite, SWT.CHECK | SWT.LEFT);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gridData.horizontalSpan = 2;
- disagreedLicensesButton.setLayoutData(gridData);
- disagreedLicensesButton.setText(CacheMessages._UI_PREF_PROMPT_FOR_DISAGREED_LICENSES);
- disagreedLicensesButton.setSelection(CachePlugin.getDefault().getPreferenceStore()
- .getBoolean(PreferenceConstants.PROMPT_DISAGREED_LICENSES));
- disagreedLicensesButton.addSelectionListener(new SelectionListener()
- {
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- widgetSelected(e);
-
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- boolean prompt = disagreedLicensesButton.getSelection();
- CachePlugin.getDefault().setPromptDisagreedLicenses(prompt);
- }
-
- });
-
- // Create the entities group.
- Label entriesLabel = new Label(composite, SWT.WRAP);
- entriesLabel.setText(CacheMessages._UI_PREF_CACHE_ENTRIES_TITLE);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gridData.horizontalSpan = 2;
- entriesLabel.setLayoutData(gridData);
-
- entries = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(entries,
- ContextIds.PREF_ENTRIES);
- String[] cacheEntries = Cache.getInstance().getCachedURIs();
- Arrays.sort(cacheEntries);
- entries.setItems(cacheEntries);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_FILL);
- gridData.grabExcessHorizontalSpace = true;
- gridData.grabExcessVerticalSpace = true;
- entries.setLayoutData(gridData);
- entries.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent event)
- {
- setPreferenceWidgets();
- }
- });
-
- Composite buttonComposite = new Composite(composite, SWT.NULL);
- GridLayout gridLayout = new GridLayout();
- gridLayout.horizontalSpacing = 0;
- gridLayout.verticalSpacing = convertVerticalDLUsToPixels(3);
- gridLayout.marginWidth = 0;
- gridLayout.marginHeight = 0;
- gridLayout.numColumns = 1;
- buttonComposite.setLayout(gridLayout);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_FILL | SWT.TOP);
- buttonComposite.setLayoutData(gridData);
- // Create the Delete button
- deleteButton = new Button(buttonComposite, SWT.PUSH);
- deleteButton.setText(CacheMessages._UI_BUTTON_DELETE_ENTRY);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- gridData.grabExcessHorizontalSpace = true;
- deleteButton.setLayoutData(gridData);
- deleteButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent event)
- {
- if (MessageDialog
- .openConfirm(
- Display.getDefault().getActiveShell(),
- CacheMessages._UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_TITLE,
- CacheMessages._UI_CONFIRM_DELETE_CACHE_ENTRY_DIALOG_MESSAGE))
- {
- String[] selectedEntries = entries.getSelection();
- int numSelectedEntries = selectedEntries.length;
-
- Cache cache = Cache.getInstance();
- for (int i = 0; i < numSelectedEntries; i++)
- {
- cache.deleteEntry(selectedEntries[i]);
- }
- String[] cacheEntries = cache.getCachedURIs();
- Arrays.sort(cacheEntries);
- entries.setItems(cacheEntries);
- setPreferenceWidgets();
- }
- }
- });
-
- // Create the Clear Cache button
- clearButton = new Button(buttonComposite, SWT.PUSH);
- clearButton.setText(CacheMessages._UI_BUTTON_CLEAR_CACHE);
- gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- gridData.grabExcessHorizontalSpace = true;
- clearButton.setLayoutData(gridData);
- clearButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent event)
- {
- if (MessageDialog.openConfirm(Display.getDefault().getActiveShell(),
- CacheMessages._UI_CONFIRM_CLEAR_CACHE_DIALOG_TITLE,
- CacheMessages._UI_CONFIRM_CLEAR_CACHE_DIALOG_MESSAGE))
- {
- Cache cache = Cache.getInstance();
- cache.clear();
- String[] cacheEntries = cache.getCachedURIs();
- Arrays.sort(cacheEntries);
- entries.setItems(cacheEntries);
- setPreferenceWidgets();
- }
- }
- });
-
- } catch (Exception e)
- {
- //TODO: Log error
- e.printStackTrace();
- }
- setPreferenceWidgets();
- applyDialogFont(composite);
-
- return composite;
- }
-
- /**
- * Set the preference page widgets. There are a few rules. 1. If disabled, all
- * of the widgets are diabled except for the disabled check box. 2. If
- * enabled, all widgets are enabled except a. The delete button is enabled
- * only if there is a selection in the list. b. The clear button is enabled
- * only if there are items in the list.
- */
- public void setPreferenceWidgets()
- {
- if (composite != null && composite.getEnabled())
- {
- if (entries.getSelectionCount() > 0)
- {
- deleteButton.setEnabled(true);
- }
- else
- {
- deleteButton.setEnabled(false);
- }
- if (entries.getItemCount() > 0)
- {
- clearButton.setEnabled(true);
- }
- else
- {
- clearButton.setEnabled(false);
- }
-
- }
- }
-
- /*
- * @see PreferencePage#createControl(Composite)
- */
- public void createControl(Composite parent)
- {
- super.createControl(parent);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ContextIds.PREF); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/ContextIds.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/ContextIds.java
deleted file mode 100644
index 259cafb..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/ContextIds.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.internal.preferences;
-
-import org.eclipse.wst.internet.cache.internal.CachePlugin;
-
-/**
- * Constant ids for context help.
- */
-public interface ContextIds {
- public static final String PREF = CachePlugin.PLUGIN_ID + ".cpr0000";
- public static final String PREF_ENTRIES = CachePlugin.PLUGIN_ID + ".cpr0002";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceConstants.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceConstants.java
deleted file mode 100644
index a51c4ae..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceConstants.java
+++ /dev/null
@@ -1,23 +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.internet.cache.internal.preferences;
-
-/**
- * Constant definitions for plug-in preferences
- */
-public class PreferenceConstants
-{
- public static final String CACHE_ENABLED = "cacheEnabled";
-
- public static final String PROMPT_DISAGREED_LICENSES = "promptDisagreedLicenses";
-
-}
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceInitializer.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceInitializer.java
deleted file mode 100644
index a7b4af9..0000000
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/PreferenceInitializer.java
+++ /dev/null
@@ -1,33 +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.internet.cache.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.wst.internet.cache.internal.CachePlugin;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
- /**
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
- public void initializeDefaultPreferences()
- {
- IPreferenceStore store = CachePlugin.getDefault().getPreferenceStore();
- store.setDefault(PreferenceConstants.CACHE_ENABLED, true);
- store.setDefault(PreferenceConstants.PROMPT_DISAGREED_LICENSES, false);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
deleted file mode 100644
index 1ed4bfa..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validateui"/>
- <classpathentry kind="src" path="property_files"/>
- <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"/>
- <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 1653b84..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Fri Feb 23 00:07:50 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=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.3
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 171d83d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Mar 29 04:09:11 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
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 418c4d6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.validation.ui; singleton:=true
-Bundle-Version: 1.1.102.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.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
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 73db36e..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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors 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 60036b0..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-bin.includes = .,\
- plugin.xml,\
- META-INF/,\
- about.html,\
- icons/,\
- plugin.properties
-source.. = validateui/,\
- property_files/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties b/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties
deleted file mode 100644
index 5938f6c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-CONTACT=ruthdaly@ca.ibm.com
-ComponentShortName=validationui
-ComponentFullName=Validation Framework UI
-ComponentCompetency=Validation
-JavaCompile.1=srcjar
-BuildVerification.1=dir
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/build/package.xml b/plugins/org.eclipse.wst.validation.ui/build/package.xml
deleted file mode 100644
index 0ae0c31..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project name="com.ibm.etools.validation.ui" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.validation.ui"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.properties"/>
- <include name="plugin.xml"/>
- <include name="runtime/validateui.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt b/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt
deleted file mode 100644
index b96f41c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt
+++ /dev/null
@@ -1 +0,0 @@
-validateui
diff --git a/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml b/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml
deleted file mode 100644
index 77c0b82..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
- <antcall target="buildjar">
- <param name="jarname" value="${defaultjarname}"/>
- <param name="jarclasspath" value="${plugin.classpath}"/>
- </antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
deleted file mode 100644
index 91333a1..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
deleted file mode 100644
index 1d8900b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
deleted file mode 100644
index 9c99aad..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
deleted file mode 100644
index 09166da..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.validation.ui/plugin.properties
deleted file mode 100644
index b8d12f2..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-#
-# 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
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 94a65b2..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.internal.ui.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.internal.ui.ValidationPropertiesPage"
- id="ValidationPropertiesPage">
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- </page>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml b/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml
deleted file mode 100644
index 1c3e278..0000000
--- a/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +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.etools.validation.ui"/>
- <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_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties
deleted file mode 100644
index 732a7fb..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties
+++ /dev/null
@@ -1,128 +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
-###############################################################################
-# *************************************************************************
-# * 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_FULL=Run validation when you manually build a project
-PREF_BUTTON_AUTO=Run validation automatically when you save changes to a resource
-PREF_BUTTON_ENABLEALL=Enable All
-PREF_BUTTON_DISABLEALL=Disable All
-PREF_VALLIST_TITLE=The selected validators will run when validation is performed:
-PREF_LBL_MAXMSGS=Maximum number of validation messages on a project
-PREF_ERROR_INT=IWAE0001E The number of validation messages must be a positive integer.
-PREF_BUTTON_ASYNC=Run validation in a background thread
-PREF_MNU_MANUAL=&Manual
-PREF_MNU_BUILD=&Build
-PREF_MNU_SETTINGS=&Settings...
-
-PROP_BUTTON_OVERRIDE=Override validation preferences
-PROP_BUTTON_FULL=Run validation when you manually build {0}
-VBF_UI_LBL_AUTO_VALIDATE=Run validation automatically when you save changes to {0} resources.
-PROP_BUTTON_SELECTALL=Select All
-PROP_BUTTON_DESELECTALL=Deselect All
-VBF_UI_LBL_DESC=The selected validators will run when {0} is validated:
-PROP_LBL_MAXMSSGS=Maximum number of validation messages on {0}
-PROP_ERROR_INT=IWAE0002E The number of validation messages must be a positive integer.
-PROP_LBL_CANNOTOVERRIDE=To enable the "Override validation preferences" checkbox, select the "Allow projects to override these preference settings" checkbox in the workbench Preferences dialog.
-PROP_BUTTON_ASYNC=Run validation in a background thread on {0}
-
-VBF_EXC_INTERNAL=IWAE0003E An unexpected error occurred during validation. Read the log file.
-VBF_EXC_INTERNAL_PROJECT=IWAE0004E An unexpected error occurred during validation of project {0}. Read the log file.
-VBF_EXC_INTERNAL_TITLE=IWAE0005E Internal error
-VBF_EXC_INTERNAL_PAGE=IWAE0006E An unexpected error occured; click Cancel to close the wizard.
-
-VBF_EXC_INVALID_REGISTER=IWAE0007E Validators can run only on open resources.
-
-VBF_UI_NO_VALIDATORS_INSTALLED=No validators are installed.
-
-VBF_UI_LBL_NOVALIDATORS_DESC=It is not possible to run any Validators, at the project level, for this type of project.
-
-VBF_UI_NO_VALIDATORS_ENABLED=Enable at least one validator on {0}. To select the validators that you want to run, open this project''s Properties wizard, turn to the Validation section, and select one or more validators in the list.
-
-VBF_UI_CHECKBOXGROUP_TITLE=Validators
-
-VBF_UI_CLOSED_PROJECT=Validation cannot run on a closed project. Open project {0} and try again.
-VBF_UI_MSSGBOX_TITLE_NONINC=Some of the Validators Do Not Support Automatic Validation
-VBF_UI_AUTO_ON_NONINC=Although automatic validation has been selected, some of the validators will not be invoked during the automatic processing. The following validators do not support automatic validation: {0}
-
-VBF_UI_PRJNEEDINPUT=Project {0} and its children were not validated because none of the enabled validators validates that type of project.
-VBF_UI_RESNEEDINPUT=Resource {0} was not validated because none of the enabled validators validates that type of resource.
-
-VBF_UI_MAX_REPORTED=Validation was terminated on {0} because the maximum number of messages were reported.
-VBF_UI_PRJVALIDATED=Validation of project {0} is complete.
-VBF_UI_RESVALIDATED=Validation of resource {0} is complete.
-VBF_UI_CANCELLED=Validation cancelled.
-VBF_UI_COMPLETE=Validation completed.
-VBF_UI_CLOSE=Close
-VBF_UI_STATUS=Status
-VBF_UI_RESCANCELLED=Validation was cancelled on {0}.
-DISABLE_VALIDATION=Suspend all validators
-INFO=This preference applies to the projects that have org.eclipse.wst.validation.validationbuilder defined.Validators are run on the projects based on the filters defined in the org.eclipse.wst.validation.validator extension point.
-
-DELEGATES_DIALOG_TITLE=Validator Preferences
-DELEGATES_COMBO_LABEL=Implementation:
-ADD_VALIDATION_BUILDER=Add Validation Builder to project
-CONFIG_WS_SETTINGS=Configure Workspace Settings...
-VALIDATOR=Validator
-MANUAL=Manual
-BUILD=Build
-SETTINGS=Settings
-
-#
-# 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 c02ccee..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * 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;
-
-/**
- * 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.
- */
- protected 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(ResourceHandler.getExternalizedMessage(ResourceConstants.DELEGATES_DIALOG_TITLE));
-
- 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(ResourceHandler.getExternalizedMessage(ResourceConstants.DELEGATES_COMBO_LABEL));
-
- 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/ProgressAndTextDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ProgressAndTextDialog.java
deleted file mode 100644
index 63af6e3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ProgressAndTextDialog.java
+++ /dev/null
@@ -1,160 +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.ui;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Display both progress status and cumulative status (text) to the user.
- */
-public class ProgressAndTextDialog extends ProgressMonitorDialog {
- protected static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$
- protected Text text = null;
- protected boolean cancelPressed = false; // Has the "Cancel" button been clicked?
- protected boolean closePressed = false; // Has the "Close" button been clicked?
- protected boolean operationDone = false; // Has the operation completed?
- protected Cursor arrowCursor; // The cursor used in the cancel button.
-
-
- public ProgressAndTextDialog(Shell parent) {
- super(parent);
- setShellStyle(SWT.BORDER | SWT.TITLE | SWT.RESIZE); // do not make this dialog modal
- setBlockOnOpen(false); // do not force the user to close this dialog before using eclipse
- }
-
- public Control createDialogArea(Composite parent) {
- super.createDialogArea(parent);
-
- final int hHint = 100;
- final int wHint = 250;
-
- Composite composite = new Composite(parent, SWT.NONE);
- Label textLabel = new Label(composite, SWT.LEFT | SWT.WRAP);
- textLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_STATUS));
- GridData labelData = new GridData();
- labelData.horizontalSpan = 2;
- textLabel.setLayoutData(labelData);
-
- composite.setLayout(new GridLayout()); // use the layout's default preferences
- GridData data = new GridData(GridData.FILL_BOTH);
- data.heightHint = hHint;
- data.widthHint = wHint;
- data.horizontalSpan = 2;
- composite.setLayoutData(data);
-
- text = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY | SWT.BORDER);
- GridData d = new GridData(GridData.FILL_BOTH);
- text.setLayoutData(d);
-
- return composite;
- }
-
- public void addText(final String messageString) {
- if (getShell() != null) {
- getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- text.append(messageString);
- text.append(NEWLINE);
- }
- });
- }
- }
-
- /**
- * Do not dismiss the dialog until the user presses the Close button.
- */
- public boolean close() {
- if (closePressed) {
- // Cancel button converted to "Close" button, and user clicked the "Close" button
- return super.close();
- }
-
- // Turn the "cancel" button into a "Close" button and keep the window open until
- // the user clicks the "Close" button.
- progressIndicator.setVisible(false);
- if (arrowCursor == null)
- arrowCursor = new Cursor(cancel.getDisplay(), SWT.CURSOR_ARROW);
- getShell().setCursor(arrowCursor);
- if (cancelPressed) {
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CANCELLED));
- } else {
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_COMPLETE));
- }
- cancel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CLOSE));
- cancel.setEnabled(true);
- return false;
- }
-
- protected void internalCancelPressed() {
- // Has this method been called because "Cancel" has been clicked or
- // because "Close" has been clicked?
- if (operationDone) {
- // "Close" was clicked.
- closePressed = true;
- close();
- } else {
- // "Cancel" was clicked.
- cancelPressed = true;
- }
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
-
- // Cannot override cancelPressed() because of the way that
- // ProgressMonitorDialog is coded.
- // The ProgressMonitorDialog parent, instead of overriding the
- // cancelPressed() method, added an anonymous Listener to the
- // cancel button. When the button's Listener is invoked, if
- // close() has been called by cancelPressed(), then an
- // exception is thrown (SWTException - "Widget is disposed').
- // Work around this by adding an anonymous
- // cancel listener, which will be called after the parent's
- // cancel listener, and this class' listener will call close().
- cancel.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- internalCancelPressed();
- }
- });
- }
-
- /**
- * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean,
- * IRunnableWithProgress)
- */
- public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
- try {
- super.run(fork, cancelable, runnable);
- } finally {
- operationDone = true;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java
deleted file mode 100644
index 87f386f..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java
+++ /dev/null
@@ -1,106 +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;
-
-
-/**
- * This interface contains the constants used as keys into the ResourceBundle.
- */
-public interface ResourceConstants {
- // Internal error has occurred.
- public static final String VBF_EXC_INTERNAL = "VBF_EXC_INTERNAL"; //$NON-NLS-1$
-
- // Internal error occurred while constructing or running the Properties or Preference page.
- public static final String VBF_EXC_INTERNAL_PAGE = "VBF_EXC_INTERNAL_PAGE"; //$NON-NLS-1$
-
- // Internal error has occurred.
- public static final String VBF_EXC_INTERNAL_PROJECT = "VBF_EXC_INTERNAL_PROJECT"; //$NON-NLS-1$
- public static final String VBF_EXC_INTERNAL_TITLE = "VBF_EXC_INTERNAL_TITLE"; //$NON-NLS-1$
-
- // Should never happen, since plugin.xml specifies an IProject objectClass filter, but if the
- // ValidationPropertiesPage is shown on a non-IProject resource, this message will be what's
- // shown.
- public static final String VBF_EXC_INVALID_REGISTER = "VBF_EXC_INVALID_REGISTER"; //$NON-NLS-1$
-
- // On the Properties Page, this is the string which explains to the user what to do. The string
- // is
- // displayed in a label.
- public static final String VBF_UI_LBL_DESC = "VBF_UI_LBL_DESC"; //$NON-NLS-1$
-
- // On the Properties Page, this is the string which explains to the user what to do. The string
- // is
- // displayed in a label.
- public static final String VBF_UI_LBL_NOVALIDATORS_DESC = "VBF_UI_LBL_NOVALIDATORS_DESC"; //$NON-NLS-1$
-
- // Label on the checkbox button of the validator page
- public static final String VBF_UI_LBL_AUTO_VALIDATE = "VBF_UI_LBL_AUTO_VALIDATE"; //$NON-NLS-1$
-
- // If the user has selected "Validate this project" from the popupMenu, but has no validators
- // enabled, tell them that nothing will run.
- public static final String VBF_UI_NO_VALIDATORS_ENABLED = "VBF_UI_NO_VALIDATORS_ENABLED"; //$NON-NLS-1$
-
- // On the Properties Page, this is the title of the group which encloses the CheckboxTableViewer
- // (the list of configured validators).
- public static final String VBF_UI_CHECKBOXGROUP_TITLE = "VBF_UI_CHECKBOXGROUP_TITLE"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_ON_NONINC = "VBF_UI_AUTO_ON_NONINC"; //$NON-NLS-1$
- public static final String VBF_UI_MSSGBOX_TITLE_NONINC = "VBF_UI_MSSGBOX_TITLE_NONINC"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_NOTE = "VBF_UI_AUTO_NOTE"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_NOTE_TEXT = "VBF_UI_AUTO_NOTE_TEXT"; //$NON-NLS-1$
- public static final String VBF_UI_MENUITEM_TEXT = "VBF_UI_MENUITEM_TEXT"; //$NON-NLS-1$
- public static final String VBF_UI_MENUITEM_TEXT_DEFAULT = "VBF_UI_MENUITEM_TEXT_DEFAULT"; //$NON-NLS-1$
- public static final String VBF_UI_CLOSED_PROJECT = "VBF_UI_CLOSED_PROJECT"; //$NON-NLS-1$
- public static final String VBF_UI_NO_VALIDATORS_INSTALLED = "VBF_UI_NO_VALIDATORS_INSTALLED"; //$NON-NLS-1$
-
- public static final String VBF_UI_POPUP_RUNVALIDATION = "%VBF_UI_POPUP_RUNVALIDATION"; //$NON-NLS-1$
-
- /* package */static final String PREF_BUTTON_ENABLEALL = "PREF_BUTTON_ENABLEALL"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_DISABLEALL = "PREF_BUTTON_DISABLEALL"; //$NON-NLS-1$
- /* package */static final String PREF_VALLIST_TITLE = "PREF_VALLIST_TITLE"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_AUTO = "PREF_BUTTON_AUTO"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_OVERRIDE = "PREF_BUTTON_OVERRIDE"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_FULL = "PREF_BUTTON_FULL"; //$NON-NLS-1$
- /* package */static final String PREF_LBL_MAXMSGS = "PREF_LBL_MAXMSGS"; //$NON-NLS-1$
- /* package */static final String PREF_MNU_MANUAL = "PREF_MNU_MANUAL"; //$NON-NLS-1$
- /* package */static final String PREF_MNU_BUILD = "PREF_MNU_BUILD"; //$NON-NLS-1$
- /* package */static final String PREF_MNU_SETTINGS = "PREF_MNU_SETTINGS"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_OVERRIDE = "PROP_BUTTON_OVERRIDE"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_FULL = "PROP_BUTTON_FULL"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_SELECTALL = "PROP_BUTTON_SELECTALL"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_DESELECTALL = "PROP_BUTTON_DESELECTALL"; //$NON-NLS-1$
- /* package */static final String PROP_LBL_MAXMSSGS = "PROP_LBL_MAXMSSGS"; //$NON-NLS-1$
- /* package */static final String PREF_ERROR_INT = "PREF_ERROR_INT"; //$NON-NLS-1$
- /* package */static final String PROP_ERROR_INT = "PROP_ERROR_INT"; //$NON-NLS-1$
-
- /* package */static final String VBF_UI_PRJNEEDINPUT = "VBF_UI_PRJNEEDINPUT"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESNEEDINPUT = "VBF_UI_RESNEEDINPUT"; //$NON-NLS-1$
- /* package */static final String VBF_UI_MAX_REPORTED = "VBF_UI_MAX_REPORTED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_PRJVALIDATED = "VBF_UI_PRJVALIDATED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESVALIDATED = "VBF_UI_RESVALIDATED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_CANCELLED = "VBF_UI_CANCELLED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_COMPLETE = "VBF_UI_COMPLETE"; //$NON-NLS-1$
- /* package */static final String VBF_UI_CLOSE = "VBF_UI_CLOSE"; //$NON-NLS-1$
- /* package */static final String VBF_UI_STATUS = "VBF_UI_STATUS"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESCANCELLED = "VBF_UI_RESCANCELLED"; //$NON-NLS-1$
-
- /* package */static final String DISABLE_VALIDATION = "DISABLE_VALIDATION"; //$NON-NLS-1$
- /* package */static final String ADD_VALIDATION_BUILDER = "ADD_VALIDATION_BUILDER"; //$NON-NLS-1$
- static final String INFO = "INFO"; //$NON-NLS-1$
-
- String DELEGATES_DIALOG_TITLE = "DELEGATES_DIALOG_TITLE"; //$NON-NLS-1$
- String DELEGATES_COMBO_LABEL = "DELEGATES_COMBO_LABEL"; //$NON-NLS-1$
-
- public static final String CONFIG_WS_SETTINGS="CONFIG_WS_SETTINGS";//$NON-NLS-1$
- public static final String VALIDATOR = "VALIDATOR"; //$NON-NLS-1$
- public static final String MANUAL = "MANUAL"; //$NON-NLS-1$
- public static final String BUILD = "BUILD"; //$NON-NLS-1$
- public static final String SETTINGS = "SETTINGS"; //$NON-NLS-1$
-
- }
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java
deleted file mode 100644
index c5a371e..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java
+++ /dev/null
@@ -1,110 +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;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-
-/**
- * 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(ValidationUIPlugin.getBundleName());
- } catch (MissingResourceException exc) {
- _bundle = null;
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getBundle()"); //$NON-NLS-1$
- entry.setText("Cannot find bundle " + ValidationUIPlugin.getBundleName()); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- }
- return _bundle;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- ResourceBundle bundle = getBundle();
- if (bundle == null) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Resource bundle is null"); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
- return key;
- }
-
- return bundle.getString(key);
- } catch (NullPointerException exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- return key;
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), parms);
- } catch (MissingResourceException exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- } catch (NullPointerException exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- return res;
- }
-}
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 9a4dd7f..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
+++ /dev/null
@@ -1,90 +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 - 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, "Unable to set save automatically preference in save files for validation dialog: " + 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 808c002..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of 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.ArrayList;
-import java.util.HashSet;
-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 inputs = new HashSet();
- List result = new ArrayList(0);
- 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 (IEditorPart[]) 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 d52b12d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
+++ /dev/null
@@ -1,66 +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.ui;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-
-public class ValidateAction extends SelectionListenerAction {
- protected ValidationMenuAction delegate;
-
- public ValidateAction() {
- super(ValidationUIPlugin.getResourceString(ResourceConstants.VBF_UI_POPUP_RUNVALIDATION));
- 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;
- }
-}
\ No newline at end of file
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 c4308f4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ /dev/null
@@ -1,680 +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.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.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.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.Event;
-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.common.frameworks.internal.ui.WTPUIPlugin;
-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.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidationSelectionHandlerRegistryReader;
-import org.eclipse.wst.validation.internal.operations.ManualIncrementalValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.ManualValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-/**
- * 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 = null;
- protected static final String SEP = "/"; //$NON-NLS-1$
- private Display _currentDisplay = null;
- private IResourceVisitor _folderVisitor = null;
- private IResourceVisitor _projectVisitor = null;
- private Map _selectedResources = null;
- //protected IWorkbenchContext workbenchContext;
-
- public ValidationMenuAction() {
- super();
- _currentDisplay = Display.getCurrent(); // cache the display before
- // this action is forked. After
- // the action is forked,
- // Display.getCurrent() returns
- // null.
- _selectedResources = new HashMap();
- }
-
- 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;
- }
-
- private ISelection getCurrentSelection() {
- return _currentSelection;
- }
-
- /**
- * 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.
- */
- // TODO: Check this method for selected resources.
- private Map loadSelected(ValidateAction action, boolean refresh) {
- if (refresh) {
- // selectionChanged(IAction, ISelection) has been called. Flush the
- // existing cache of resources and
- // add just the currently selected ones.
- _selectedResources.clear();
- }
- ISelection selection = getCurrentSelection();
- if ((selection == null) || selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
- return null;
- }
- Object[] elements = ((IStructuredSelection) selection).toArray();
- for (int i = 0; i < elements.length; i++) {
- Object element = elements[i];
- if (element == null) {
- continue;
- }
- 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 at least one non-validatable element 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 changedRes = null;
- if (added) {
- // If the value is null, the entire project needs to be validated
- // anyway.
- changedRes = (Set) _selectedResources.get(project);
- if (changedRes == null) {
- return;
- }
- } else {
- changedRes = new HashSet();
- }
- 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) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction.addSelected(IFolder)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction.addSelected(IFolder)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return;
- }
- }
-
- private IResourceVisitor getProjectVisitor() {
- if (_projectVisitor == null) {
- _projectVisitor = 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 _projectVisitor;
- }
-
- /**
- * The delegating action has been performed. Implement this method to do the actual work.
- *
- * @param action
- * action proxy that handles the presentation portion of the plugin action
- * @param window
- * the desktop window passed by the action proxy
- */
- public void run(IAction action) {
- // TODO: Insert dirty file check here.
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map projects = loadSelected(vaction, false);
- if ((projects == null) || (projects.size() == 0)) {
- return;
- }
-
- // If the files aren't saved do not run validation.
- if(!handleFilesToSave(projects))
- {
- return;
- }
-
- ValidationJob validationop = new ValidationJob(ValidationUIMessages.RunValidationDialogTitle){
- protected IStatus run(IProgressMonitor monitor) {
- final Map projectsMap = projects;
- IStatus stat = validate(monitor, projectsMap);
- _selectedResources.clear();
- return stat;
- }
- };
- validationop.setProjectsMap(projects);
- validationop.setRule(ResourcesPlugin.getWorkspace().getRoot());
- validationop.setUser(true);
- validationop.schedule();
- }
-
- private IStatus validate(final IProgressMonitor monitor, final Map projects) {
- boolean cancelled = false; // Was the operation cancelled?
- Iterator iterator = projects.keySet().iterator();
- while (iterator.hasNext()) {
-
- if ( monitor.isCanceled() )
- return new Status(IStatus.CANCEL, "org.eclipse.wst.validation", 0, "OK", null);;
- IProject project = (IProject) iterator.next();
- if (project == null) {
- continue;
- }
- try {
- if (cancelled) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESCANCELLED, new String[]{project.getName()});
- monitor.setTaskName(message);
- continue;
- }
- if (!project.isOpen()) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CLOSED_PROJECT, new String[]{project.getName()});
- monitor.setTaskName(message);
- continue;
- }
- performValidation(monitor, projects, project);
- } catch (OperationCanceledException exc) {
- // When loading file deltas, if the operation has been
- // cancelled, then
- // resource.accept throws an OperationCanceledException.
- cancelled = true;
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESCANCELLED, new String[]{project.getName()});
- monitor.setTaskName(message);
- } catch (Exception exc) {
- logException(monitor, project, exc);
- }
- }
- return new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null);
- }
-
-
-
- /**
- * @param dialog
- * @param project
- * @param exc
- */
-
- private void logException(IProgressMonitor monitor, IProject project, Throwable exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("ValidationMenuAction.validate"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PROJECT, new String[]{project.getName()});
- monitor.setTaskName(internalErrorMessage);
- }
-
- /**
- * @param monitor
- * @param projects
- * @param dialog
- * @param project
- * @throws CoreException
- */
-
- private IStatus performValidation(final IProgressMonitor monitor, final Map projects,
- IProject project) throws CoreException {
- // Even if the "maximum number of messages" message is on
- // the task list,
- // run validation, because some messages may have been
- // fixed
- // and there may be space for more messages.
-
- if ( monitor.isCanceled() )
- return new Status(IStatus.CANCEL, "org.eclipse.wst.validation", 0, "OK", null);
-
- Set changedResources = (Set) projects.get(project);
- IResource[] resources = null;
- if (changedResources != null) {
- resources = new IResource[changedResources.size()];
- changedResources.toArray(resources);
- }
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if (prjp.numberOfManualEnabledValidators() > 0) {
- checkProjectConfiguration(monitor, project, resources, prjp);
- } else {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_NO_VALIDATORS_ENABLED, new String[]{project.getName()});
- monitor.setTaskName(message);
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction::run"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- return new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null);
- }
-
- /**
- * @param monitor
- * @param dialog
- * @param project
- * @param resources
- * @param prjp
- * @throws InvocationTargetException
- * @throws CoreException
- */
- private IStatus checkProjectConfiguration(final IProgressMonitor monitor,
- IProject project, IResource[] resources, ProjectConfiguration prjp) throws InvocationTargetException, CoreException {
- boolean successful = true; // Did the operation
- // complete
- // successfully?
- if ( monitor.isCanceled() )
- new Status(IStatus.CANCEL, "org.eclipse.wst.validation", 0, "OK", null);
-
- ManualValidatorsOperation validOp = null;
- //validOp = new ManualValidatorsOperation(project, resources);
- if (resources == null) {
- validOp = new ManualValidatorsOperation(project);
- } else {
- validOp = new ManualIncrementalValidatorsOperation(project, resources);
- }
- if (validOp.isNecessary(monitor)) {
- validOp.run(monitor);
- } else {
- if (resources == null) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_PRJNEEDINPUT, new String[]{project.getName()});
- monitor.setTaskName(message);
- } else {
- for (int i = 0; i < resources.length; i++) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESNEEDINPUT, new String[]{resources[i].getFullPath().toString()});
- monitor.setTaskName(message);
- }
- }
- }
- if (successful) {
- performSucessful(monitor, project, resources);
- } else {
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PROJECT, new String[]{project.getName()});
- monitor.setTaskName(internalErrorMessage);
- }
- return new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null);
- }
-
-
-
- /**
- * @param dialog
- * @param project
- * @param resources
- */
- private void performSucessful(final IProgressMonitor monitor, IProject project, IResource[] resources) {
- boolean limitExceeded = ValidatorManager.getManager().wasValidationTerminated(project);
- if (limitExceeded) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_MAX_REPORTED, new String[]{project.getName()});
- monitor.setTaskName(message);
- } else if (resources == null) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_PRJVALIDATED, new String[]{project.getName()});
- monitor.setTaskName(message);
- } else {
- for (int i = 0; i < resources.length; i++) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESVALIDATED, new String[]{resources[i].getFullPath().toString()});
- monitor.setTaskName(message);
- }
- }
- }
-
- /**
- * Selection in the desktop has changed. Plugin 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 plugin action
- * @param selection
- * current selection in the desktop
- */
- public void selectionChanged(IAction action, ISelection selection) {
- _currentSelection = selection;
- int count = 0;
- boolean fwkActivated = (ValidationPlugin.isActivated() && ValidationRegistryReader.isActivated());
- if (fwkActivated) {
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map projects = loadSelected(vaction, true);
- if ((projects != null) && (projects.size() > 0)) {
- Iterator iterator = projects.keySet().iterator();
- while (iterator.hasNext()) {
- // If at least one project can be validated, make "enabled"
- // true and
- // let the dialog tell the user which projects need to be
- // opened,
- // validators enabled, etc.
- IProject project = (IProject) iterator.next();
- if ((project != null) && (project.isOpen())) {
- // If the validation plugin hasn't been activated yet,
- // don't activate it just to
- // find out if there are validators. Only ask if there
- // are enabled validators if
- // the plugin has already been activated.
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfigurationWithoutMigrate(project);
- if( !prjp.isDisableAllValidation() ){
- count += prjp.numberOfManualValidators();
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction::selectionChanged"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- if (count > 0)
- break;
- }
- }
- }
- }
- action.setEnabled((count > 0) || (!fwkActivated)); // Don't disable the
- // action just
- // because the
- // framework hasn't
- // been activated.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorActionsExtension#init(org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorExtensionSite)
- */
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- run(action);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
- */
- public void init(IViewPart view) {
- //init
-
- }
-
- /**
- * 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 projects)
- {
- List fileList = getIFiles(projects);
- final IEditorPart[] dirtyEditors = SaveFilesHelper.getDirtyEditors(fileList);
- if(dirtyEditors == null || dirtyEditors.length == 0)
- return true;
- boolean saveAutomatically = false;
- try
- {
- saveAutomatically = new GlobalConfiguration(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) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- }
- }
- return false;
- }
-
- protected List getIFiles(Map projects)
- {
- List fileList = new ArrayList();
- Set projectKeys = projects.keySet();
- Iterator projectIter = projectKeys.iterator();
- while(projectIter.hasNext())
- {
- IProject project = (IProject) projectIter.next();
- Set resourcesList = (Set) projects.get(project);
- Iterator resourcesIter = resourcesList.iterator();
- while(resourcesIter.hasNext())
- {
- IResource resource = (IResource)resourcesIter.next();
- if(resource instanceof IFile)
- {
- fileList.add(resource);
- }
- }
- }
- return fileList;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java
deleted file mode 100644
index af41cd3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java
+++ /dev/null
@@ -1,1180 +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.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-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.TableLayout;
-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.common.frameworks.internal.ui.WTPUIPlugin;
-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.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-/**
- * This class and its inner classes are not intended to be subclassed outside of the validation
- * framework.
- */
-public class ValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
- private IValidationPage _pageImpl = null;
-
- /**
- * Initially, this interface was created as an abstract class, and getControl() was implemented.
- * (getProject() could also have been implemented in the abstract class.) However, at runtime, a
- * NullPointerException was thrown; the inner class had lost its pointer to its enclosing class.
- * After some experimentation, I discovered that if I changed the parent to an interface, the
- * enclosing class could be found. (Merely moving the AValidationPage into its own file was
- * insufficient.)
- */
-public interface IValidationPage {
- public Composite createPage(Composite parent) throws InvocationTargetException;
-
- public boolean performOk() throws InvocationTargetException;
-
- public boolean performDefaults() throws InvocationTargetException;
-
- public Composite getControl();
-
- public void dispose();
-
- public void loseFocus(); // Page is losing focus (event notification)
-
- public void gainFocus(); // Page is gaining focus (event notification)
-}
-
-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) {
- // 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);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.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 class NoValidatorsPage implements IValidationPage {
- private Composite page = null;
- private Composite composite = null;
- private GridLayout layout = null;
- private GridData data = null;
- private Label messageLabel = null;
-
- public NoValidatorsPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is created if an IProject is selected, but that project has no validators
- * configured (i.e., the page is valid, but an empty list.)
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- // top level group
- 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);
- data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- composite.setLayoutData(data);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_NO_VALIDATORS_INSTALLED));
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
-
- /**
- * Since there are no validators, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- // data.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 class ValidatorListPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- TableViewer validatorList = null;
- private Button enableAllButton = null;
- private Button disableAllButton = null;
- private Label emptyRowPlaceholder = null;
- Button disableAllValidation = null;
- Button overrideButton = null;
- Button saveButton = null;
- private Label listLabel = null;
- private Table validatorsTable;
-
- GlobalConfiguration pagePreferences = null; // the values currently on the page, but not
- // necessarily stored yet. Package visibility
- // for the widget listeners (the compiler would
- // have to create a synthetic accessor method in
- // order to access this field)
- //private boolean _isAutoBuildEnabled; // initialized in the constructor
- private ValidatorMetaData[] _oldVmd = null; // Cache the enabled validators so that, if
- private Map _oldDelegates = null; // Cache the validator delegates.
- // there is no change to this list, the
- // expensive task list update can be avoided
- private boolean _allow = false; // Cache the value of the prefence "allow projects to
-
- // override" so that, when OK is clicked, we can determine
- // if "allow" has changed or not.
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given
- * element. These elements can be presented as rows in a table, items in a list, etc.
- * The result is not modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMetaData[]) {
- // The Collection is the Collection which is returned by ValidatorManager's
- // getConfiguredValidatorMetaData(IProject) call.
- // This Collection is set to be the input of the CheckboxTableViewer in
- // ValidationPropertiesPage$ValidatorListPage's createPage(Composite)
- // method.
- return (ValidatorMetaData[]) inputElement;
- }
- return new Object[0];
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a
- * different element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to
- * changes on the new input (using model-specific means), and deregistering the viewer
- * from the old input. In response to these change notifications, the content provider
- * propagates the changes to the viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not
- * previously have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have
- * an input
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
-
-
- }
-
- /**
- * This class is provided for ValidationPropertiesPage$ValidatorListPage's
- * checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- /**
- * Override the LabelProvider's text, by customizing the text for a ValidatorMetaData
- * element.
- */
- public String getText(Object element) {
- if (element == null) {
- return ""; //$NON-NLS-1$
- } else if (element instanceof ValidatorMetaData) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- } else {
- return super.getText(element);
- }
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !validatorsTable.isEnabled();
- if (isDisabled) {
- imageName = imageName + "_disabled"; //$NON-NLS-N$
- }
- Image image = ValidationUIPlugin.getPlugin().getImage(imageName);
- return image;
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- if(columnIndex == 1) {
- if(((ValidatorMetaData)element).isManualValidation())
- return getImage("ok_tbl");
- return getImage("fail_tbl");
- }
- else if(columnIndex == 2) {
- if(((ValidatorMetaData)element).isBuildValidation())
- return getImage("ok_tbl");;
- return getImage("fail_tbl");
- }
- else if (columnIndex == 3)
- {
- ValidatorMetaData vmd = (ValidatorMetaData)element;
-
- if (vmd.isDelegating())
- {
- return getImage("settings");
- }
- }
- return null;
-
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if(columnIndex == 0) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- }
- /*if(columnIndex == 1) {
- if(((ValidatorMetaData)element).isManualValidation())
- return COMBO_VALUES[0];
- return COMBO_VALUES[1];
- } else if(columnIndex == 2) {
- if(((ValidatorMetaData)element).isBuildValidation())
- return COMBO_VALUES[0];
- return COMBO_VALUES[1];
- }*/
- return null;
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- /**
- * Returns a negative, zero, or positive number depending on whether the first element
- * is less than, equal to, or greater than the second element.
- * <p>
- * The default implementation of this method is based on comparing the elements'
- * categories as computed by the <code>category</code> framework method. Elements
- * within the same category are further subjected to a case insensitive compare of their
- * label strings, either as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param e1
- * the first element
- * @param e2
- * the second element
- * @return a negative number if the first element is less than the second element; the
- * value <code>0</code> if the first element is equal to the second element;
- * and a positive number if the first element is greater than the second element
- */
- 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 {
- //_isAutoBuildEnabled = ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- pagePreferences = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration()); // This
- // represents the values on the page that haven't been persistedyet.
- // Start with the last values that were persisted into the current page's starting values.
-
- _oldVmd = pagePreferences.getEnabledValidators(); // Cache the enabled validators so
- // that, if there is no change to this
- // list, the expensive task list
- // update can be avoided
-
- _oldDelegates = new HashMap(pagePreferences.getDelegatingValidators());
-
- _allow = pagePreferences.canProjectsOverride();
-
- page = createPage(parent);
- }
-
- private void setupTableColumns(Table table, TableViewer viewer) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VALIDATOR));
- validatorColumn.setResizable(false);
- validatorColumn.setWidth(320);
- TableColumn manualColumn = new TableColumn(table, SWT.NONE);
- manualColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.MANUAL));
- manualColumn.setResizable(false);
- manualColumn.setWidth(40);
- TableColumn buildColumn = new TableColumn(table, SWT.NONE);
- buildColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.BUILD));
- buildColumn.setResizable(false);
- buildColumn.setWidth(40);
- TableColumn settingsColumn = new TableColumn(table, SWT.NONE);
- settingsColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.SETTINGS));
- settingsColumn.setResizable(false);
- settingsColumn.setWidth(50);
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- // top level group
- 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);
- composite.setLayout(new GridLayout()); // use the layout's default preferences
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- Composite validatorGroup = new Composite(composite, SWT.NONE);
-
-
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorGroup, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- GridData overrideData = new GridData(GridData.FILL_HORIZONTAL);
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- overrideData.horizontalSpan = 2;
- overrideButton = new Button(validatorGroup, SWT.CHECK);
- overrideButton.setLayoutData(overrideData);
- overrideButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_OVERRIDE));
- overrideButton.setEnabled(true);
- overrideButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setCanProjectsOverride(overrideButton.getSelection());
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideButton, ContextIds.VALIDATION_PREFERENCE_PAGE_OVERRIDE);
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData disableValidationData = new GridData(GridData.FILL_HORIZONTAL);
- disableValidationData.horizontalSpan = 2;
- disableAllValidation = new Button(validatorGroup, SWT.CHECK);
- disableAllValidation.setLayoutData(disableValidationData);
- disableAllValidation.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.DISABLE_VALIDATION));
- disableAllValidation.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setDisableAllValidation(disableAllValidation.getSelection());
- disableAllValidation.setFocus();
- validatorsTable.setEnabled(!disableAllValidation.getSelection());
- enableAllButton.setEnabled(!disableAllValidation.getSelection());
- disableAllButton.setEnabled(!disableAllValidation.getSelection());
- validatorList.refresh();
- }
- });
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData saveFileData = new GridData(GridData.FILL_HORIZONTAL);
- saveFileData.horizontalSpan = 2;
- saveButton = new Button(validatorGroup, SWT.CHECK);
- saveButton.setLayoutData(saveFileData);
- saveButton.setText(ValidationUIMessages.PrefPage_always_save);
- saveButton.setSelection(pagePreferences.getSaveAutomatically());
- saveButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setSaveAutomatically(saveButton.getSelection());
- saveButton.setFocus();
- }
- });
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- listLabel.setLayoutData(listLabelData);
- listLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_VALLIST_TITLE));
-
- validatorsTable = new Table(validatorGroup,SWT.BORDER | SWT.FULL_SELECTION);
- TableLayout tableLayout = new TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(160, true));
- tableLayout.addColumnData(new ColumnWeightData(40, true));
- tableLayout.addColumnData(new ColumnWeightData(30, true));
- tableLayout.addColumnData(new ColumnWeightData(40, true));
-
- validatorsTable.setHeaderVisible(true);
- validatorsTable.setLinesVisible(true);
- validatorsTable.setLayout(tableLayout);
-
- validatorList = new TableViewer(validatorsTable);
- GridData validatorListData = new GridData(GridData.FILL_HORIZONTAL);
- validatorListData.horizontalSpan = 2;
- validatorsTable.setLayoutData(validatorListData);
- validatorList.getTable().setLayoutData(validatorListData);
- validatorList.setLabelProvider(new ValidationLabelProvider());
- validatorList.setContentProvider(new ValidationContentProvider());
- validatorList.setSorter(new ValidationViewerSorter());
- setupTableColumns(validatorsTable,validatorList);
- validatorList.setInput(pagePreferences.getValidators());
- 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);
- }
- }});
-
- enableAllButton = new Button(validatorGroup, SWT.PUSH);
- enableAllButton.setLayoutData(new GridData());
- enableAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_ENABLEALL));
- enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- PlatformUI.getWorkbench().getHelpSystem().setHelp(enableAllButton, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- disableAllButton = new Button(validatorGroup, SWT.PUSH);
- disableAllButton.setLayoutData(new GridData());
- disableAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_DISABLEALL));
- disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- PlatformUI.getWorkbench().getHelpSystem().setHelp(disableAllButton, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- Composite buttonGroup = new Composite(composite, SWT.NONE);
- GridLayout buttonGroupLayout = new GridLayout();
- buttonGroupLayout.numColumns = 2;
- buttonGroup.setLayout(buttonGroupLayout);
- buttonGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- // Have to set the tab order or only the first checkbox in a Composite can
- // be tab-ed to. (Seems to apply only to checkboxes. Have to use the arrow
- // key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[]{overrideButton, disableAllValidation, saveButton, validatorList.getTable(), enableAllButton, disableAllButton});
-
- updateWidgets();
-
- applyDialogFont(composite);
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- protected Menu createContextMenu()
- {
- final Menu menu = new Menu(validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem (menu, SWT.CHECK);
- manualItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_MNU_MANUAL));
- final MenuItem buildItem = new MenuItem (menu, SWT.CHECK);
- buildItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_MNU_BUILD));
- final MenuItem settingsItem = new MenuItem (menu, SWT.PUSH);
- settingsItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.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();
- ValidatorMetaData vmd = (ValidatorMetaData) selection.getFirstElement();
- manualItem.setSelection(vmd.isManualValidation());
- buildItem.setSelection(vmd.isBuildValidation());
- settingsItem.setEnabled(vmd.isDelegating());
- }});
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit)
- {
- IStructuredSelection selection = (IStructuredSelection) validatorList.getSelection();
- ValidatorMetaData vmd = (ValidatorMetaData) selection.getFirstElement();
-
- switch (columnToEdit)
- {
- case 1:
- vmd.setManualValidation(!vmd.isManualValidation());
- break;
- case 2:
- vmd.setBuildValidation(!vmd.isBuildValidation());
- break;
- case 3:
- {
- if (!vmd.isDelegating()) {
- break;
- }
-
- String delegateID = pagePreferences.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)
- {
- pagePreferences.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- }
- break;
- default:
- break;
- }
- validatorList.refresh();
- }
-
- 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.
- updateTable();
- updateAllWidgets();
- updateHelp();
- }
-
- protected void updateWidgetsForDefaults() throws InvocationTargetException {
- updateTableForDefaults();
- updateAllWidgets();
- updateHelp();
- }
-
- /**
- * @throws InvocationTargetException
- */
- private void updateAllWidgets() throws InvocationTargetException {
- overrideButton.setSelection(pagePreferences.canProjectsOverride());
- disableAllValidation.setSelection(pagePreferences.isDisableAllValidation());
- validatorsTable.setEnabled(!disableAllValidation.getSelection());
- enableAllButton.setEnabled(!disableAllValidation.getSelection());
- disableAllButton.setEnabled(!disableAllValidation.getSelection());
- }
-
- protected void updateTable() throws InvocationTargetException {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- // default value.
- if (pagePreferences.isManualEnabled(vmd))
- vmd.setManualValidation(true);
- else
- vmd.setManualValidation(false);
- if (pagePreferences.isBuildEnabled(vmd))
- vmd.setBuildValidation(true);
- else
- vmd.setBuildValidation(false);
-
- }
- validatorList.refresh();
- }
-
- protected void updateTableForDefaults() throws InvocationTargetException {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- // default value.
- if(pagePreferences.isEnabled(vmd)) {
- vmd.setManualValidation(true);
- vmd.setBuildValidation(true);
- } else {
- vmd.setManualValidation(false);
- vmd.setBuildValidation(false);
- }
- }
- validatorList.refresh();
- }
-
- protected void enableManualAndBuildValues() {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
- vmd.setManualValidation(true);
- vmd.setBuildValidation(true);
- }
- validatorList.refresh();
- }
-
- protected void disableManualAndBuildValues() {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
- vmd.setManualValidation(false);
- vmd.setBuildValidation(false);
- }
- validatorList.refresh();
- }
-
- public boolean performOk() throws InvocationTargetException {
- storeValues();
- updateTaskList();
- return true;
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- pagePreferences.resetToDefault();
- updateWidgetsForDefaults();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- pagePreferences.setEnabledValidators(getEnabledValidators());
- enableManualAndBuildValues();
- enableAllButton.setFocus();
- return true;
- }
-
- /**
- *
- */
- private void setAllValidators(boolean bool) {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- validatorMetaData.setManualValidation(bool);
- validatorMetaData.setBuildValidation(bool);
- }
- }
-
- public ValidatorMetaData[] getEnabledValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isManualValidation() || validatorMetaData.isBuildValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
- }
-
- public ValidatorMetaData[] getEnabledManualValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isManualValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
-
- }
-
- public ValidatorMetaData[] getEnabledBuildValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isBuildValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
-
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- pagePreferences.setEnabledValidators(getEnabledValidators());
- disableManualAndBuildValues();
- disableAllButton.setFocus();
- return true;
- }
-
- protected void updateHelp() {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(disableAllValidation, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
- private void storeValues() throws InvocationTargetException {
- pagePreferences.setCanProjectsOverride(overrideButton.getSelection());
-
- if (disableAllValidation.isEnabled()) {
- pagePreferences.setDisableAllValidation(disableAllValidation.getSelection());
- }
- //pagePreferences.setEnabledValidators(getEnabledValidators());
-
- pagePreferences.setEnabledManualValidators(getEnabledManualValidators());
-
- pagePreferences.setEnabledBuildValidators(getEnabledBuildValidators());
-
- pagePreferences.passivate();
- pagePreferences.store();
-
- // If the projects aren't allowed to override, clear their settings.
- if (!pagePreferences.canProjectsOverride()) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject[] projects = workspace.getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (project.isOpen()) {
- if (ConfigurationManager.getManager().isMigrated(project)) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(false);
- prjp.passivate();
- prjp.store();
- }
- }
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- }
-
- }
-
- private void updateTaskList() {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject[] projects = workspace.getRoot().getProjects();
- boolean allowChanged = (pagePreferences.canProjectsOverride() != _allow);
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (project.isOpen()) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if (!prjp.doesProjectOverride() && (prjp.hasEnabledValidatorsChanged(_oldVmd, allowChanged) || true) &&
- (prjp.haveDelegatesChanged(_oldDelegates, allowChanged) || true)) {
- // If the project used to override the preferences, and the preferences
- // make that impossible now, then update the task list.
- //
- // If the preferences allow projects to override, and they don't, and if
- // the validators have changed, then update the task list.
- ValidatorManager.getManager().updateTaskList(project); // 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.
- }
- }
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- listLabel.dispose();
- overrideButton.dispose();
- disableAllValidation.dispose();
- emptyRowPlaceholder.dispose();
- disableAllButton.dispose();
- enableAllButton.dispose();
- validatorList.getTable().dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not need to cache anything before it loses focus.
- }
-
- public void gainFocus() {/*
- // This page depends on the Workbench Preference page, so update the value of the
- // isAutoBuild (in case the workbench page's value has changed), and then update
- // this page's widgets.
- try {
- //_isAutoBuildEnabled = ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- */}
-}
-
-/*
- * @see PreferencePage#createContents(Composite)
- */
-protected Control createContents(Composite parent) {
- try {
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- if (gp.numberOfValidators() == 0) {
- _pageImpl = new NoValidatorsPage(parent);
- } else {
- try {
- _pageImpl = new ValidatorListPage(parent);
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
-
- return _pageImpl.getControl();
-}
-
-/*
- * @see IWorkbenchPreferencePage#init(IWorkbench)
- */
-public void init(IWorkbench workbench) {
- //init
-}
-
-protected void noDefaultAndApplyButton() {
- super.noDefaultAndApplyButton();
-}
-
-/**
- * Performs special processing when this page's Defaults button has been pressed.
- * <p>
- * This is a framework hook method for sublcasses 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 (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Exception exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.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 (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- } catch (Exception exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.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();
- }
- } catch (Exception exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
-}
-
-private void logError(Throwable exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationPreferencePage.displayAndLogError"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL_PAGE);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc instanceof InvocationTargetException) {
- if (((InvocationTargetException) exc).getTargetException() != null) {
- entry.setTargetException(((InvocationTargetException) exc).getTargetException());
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-}
-
-/**
- * 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();
-}
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
deleted file mode 100644
index 242bc3d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
+++ /dev/null
@@ -1,1303 +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
- * 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.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-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.TableLayout;
-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.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.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.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-/**
- * This class and its inner classes are not intended to be subclassed outside of the validation
- * framework.
- *
- * This page implements the PropertyPage for validators; viewed when the user right-clicks on the
- * IProject, selects "Properties", and then "Validation."
- *
- * There exist three possible page layouts: if there is an eclipse internal error, and the page is
- * brought up on a non-IProject type; if there are no validators configured on that type of
- * IProject, and a page which lists all validators configured on that type of IProject. These three
- * pages are implemented as inner classes, so that it's clear which method is needed for which
- * input. When all of the methods, and behaviour, were implemented in this one class, much more
- * error-checking had to be done, to ensure that the method wasn't being called incorrectly by one
- * of the pages.
- */
-public class ValidationPropertiesPage extends PropertyPage {
- static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$
- static final String TAB = "\t"; //$NON-NLS-1$
- static final String NEWLINE_AND_TAB = NEWLINE + TAB;
- private IValidationPage _pageImpl = null;
-
- /**
- * Initially, this interface was created as an abstract class, and getControl() was implemented.
- * (getProject() could also have been implemented in the abstract class.) However, at runtime, a
- * NullPointerException was thrown; the inner class had lost its pointer to its enclosing class.
- * After some experimentation, I discovered that if I changed the parent to an interface, the
- * enclosing class could be found. (Merely moving the AValidationPage into its own file was
- * insufficient.)
- */
- public interface IValidationPage {
- public abstract Composite createPage(Composite parent) throws InvocationTargetException;
-
- public abstract boolean performOk() throws InvocationTargetException;
-
- public boolean performDefaults() throws InvocationTargetException;
-
- public Composite getControl();
-
- public abstract void dispose();
-
- public abstract boolean performCancel();
- }
-
- 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) {
- // 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);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.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 boolean performCancel() {
- return true;
- }
- }
-
- public class NoValidatorsPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private GridData data = null;
- private Label messageLabel = null;
-
- public NoValidatorsPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is created if an IProject is selected, but that project has no validators
- * configured (i.e., the page is valid, but an empty list.)
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- // top level group
- 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);
- data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- composite.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- String[] msgParm = {getProject().getName()};
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_LBL_NOVALIDATORS_DESC, msgParm));
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since there are no validators, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- // data.dispose();
- composite.dispose();
- }
-
- public boolean performCancel() {
- return true;
- }
- }
-
- public class ValidatorListPage implements IValidationPage {
- Composite page = null;
- GridLayout layout = null;
- GridData data = null;
- Label messageLabel = null;
- TableViewer validatorList = null;
- Button overrideGlobalButton = null;
- boolean existingOverrideGlobalVal = false;
- Button disableAllValidation = null;
- boolean existingDisableAllValidation = false;
- private Button enableAllButton = null;
- private Button disableAllButton = null;
- Label emptyRowPlaceholder = null;
- private Table validatorsTable;
- ProjectConfiguration pagePreferences = null;
- private boolean canOverride = false;
- private Button addValidationBuilder = null;
- private Color color = null;
-
- private ValidatorMetaData[] oldVmd = null; // Cache the enabled validators so that, if there
- private Map oldDelegates = null; // Cache the validator delegates.
-
- // is no change to this list, the expensive task
- // list update can be avoided
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given
- * element. These elements can be presented as rows in a table, items in a list, etc.
- * The result is not modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMetaData[]) {
- // The ValidatorMetaData[] is the array which is returned by ValidatorManager's
- // getConfiguredValidatorMetaData(IProject) call.
- // This array is set to be the input of the CheckboxTableViewer in
- // ValidationPropertiesPage$ValidatorListPage's createPage(Composite)
- // method.
- return (ValidatorMetaData[]) inputElement;
- }
- return new Object[0];
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a
- * different element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to
- * changes on the new input (using model-specific means), and deregistering the viewer
- * from the old input. In response to these change notifications, the content provider
- * propagates the changes to the viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not
- * previously have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have
- * an input
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
-
-
- }
-
- /**
- * This class is provided for ValidationPropertiesPage$ValidatorListPage's
- * checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- /**
- * Override the LabelProvider's text, by customizing the text for a ValidatorMetaData
- * element.
- */
- public String getText(Object element) {
- if (element == null) {
- return ""; //$NON-NLS-1$
- } else if (element instanceof ValidatorMetaData) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- } else {
- return super.getText(element);
- }
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if(columnIndex == 0) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- }
- /*if(columnIndex == 1) {
- if(((ValidatorMetaData)element).isManualValidation())
- return ENABLED;
- return DISABLED;
- } else if(columnIndex == 2) {
- if(((ValidatorMetaData)element).isBuildValidation())
- return ENABLED;
- return DISABLED;
- }*/
- return null;
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !validatorsTable.isEnabled();
- if (isDisabled) {
- imageName = imageName + "_disabled"; //$NON-NLS-N$
- }
- Image image = ValidationUIPlugin.getPlugin().getImage(imageName);
- return image;
- }
-
-
- public Image getColumnImage(Object element, int columnIndex) {
- if(columnIndex == 1) {
- if(((ValidatorMetaData)element).isManualValidation())
- return getImage("ok_tbl");
- return getImage("fail_tbl");
- } else if(columnIndex == 2) {
- if(((ValidatorMetaData)element).isBuildValidation())
- return getImage("ok_tbl");;
- return getImage("fail_tbl");
- }
- else if (columnIndex == 3)
- {
- ValidatorMetaData vmd = (ValidatorMetaData)element;
-
- if (vmd.isDelegating())
- {
- return getImage("settings");
- }
- }
- return null;
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- /**
- * Returns a negative, zero, or positive number depending on whether the first element
- * is less than, equal to, or greater than the second element.
- * <p>
- * The default implementation of this method is based on comparing the elements'
- * categories as computed by the <code>category</code> framework method. Elements
- * within the same category are further subjected to a case insensitive compare of their
- * label strings, either as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param e1
- * the first element
- * @param e2
- * the second element
- * @return a negative number if the first element is less than the second element; the
- * value <code>0</code> if the first element is equal to the second element;
- * and a positive number if the first element is greater than the second element
- */
- 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 {
- ConfigurationManager prefMgr = ConfigurationManager.getManager();
- // ValidatorManager vMgr = ValidatorManager.getManager();
-
- pagePreferences = prefMgr.getProjectConfiguration(getProject()); // This
- // represents the values on the page that haven't been persisted yet.
- // Start with the last values that were persisted into the current
- // page's starting values.
-
- // store the default values for the widgets
- canOverride = prefMgr.getGlobalConfiguration().canProjectsOverride();
- //isAutoBuildEnabled = vMgr.isGlobalAutoBuildEnabled();
- //isBuilderConfigured = ValidatorManager.doesProjectSupportBuildValidation(getProject());
- oldVmd = pagePreferences.getEnabledValidators(); // Cache the enabled validators so
- // that, if there is no change to this
- // list, the expensive task list update
- // can be avoided
-
- oldDelegates = new HashMap(pagePreferences.getDelegatingValidators());
-
- createPage(parent);
-
- existingOverrideGlobalVal = overrideGlobalButton.getSelection();
- existingDisableAllValidation = disableAllValidation.getSelection();
- }
-
- private void setupTableColumns(Table table, TableViewer viewer) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VALIDATOR));
- validatorColumn.setResizable(false);
- validatorColumn.setWidth(320);
- TableColumn manualColumn = new TableColumn(table, SWT.NONE);
- manualColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.MANUAL));
- manualColumn.setResizable(false);
- manualColumn.setWidth(40);
- TableColumn buildColumn = new TableColumn(table, SWT.NONE);
- buildColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.BUILD));
- buildColumn.setResizable(false);
- buildColumn.setWidth(40);
- TableColumn settingsColumn = new TableColumn(table, SWT.NONE);
- settingsColumn.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.SETTINGS));
- settingsColumn.setResizable(false);
- settingsColumn.setWidth(50);
- }
-
- /**
- * This page is created if the current project has at least one validator configured on it.
- */
- public Composite createPage(Composite parent) throws InvocationTargetException {
- // top level group
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- page = new Composite(sc1, SWT.NONE);
- sc1.setContent(page);
- page.setLayout(new GridLayout()); // use the layout's default preferences
-
- Composite validatorGroup = new Composite(page, SWT.NONE);
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
-
- Hyperlink link = new Hyperlink(validatorGroup,SWT.None);
- GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
- layout.horizontalSpan = 2;
- link.setLayoutData(layout);
- link.setUnderlined(true);
- color = new Color(validatorGroup.getDisplay(),new RGB(0,0,255) );
- link.setForeground(color);
- link.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.CONFIG_WS_SETTINGS));
- link.addHyperlinkListener(new IHyperlinkListener() {
- public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
-
- public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
- }
-
- public void linkExited(org.eclipse.ui.forms.events.HyperlinkEvent e) {
- }
-
- public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent 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";
- }
- });
-
- GridData overrideData = new GridData(GridData.GRAB_HORIZONTAL);
- overrideData.horizontalSpan = 2;
- overrideGlobalButton = new Button(validatorGroup, SWT.CHECK);
- overrideGlobalButton.setLayoutData(overrideData);
- overrideGlobalButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_BUTTON_OVERRIDE, new String[]{getProject().getName()}));
- overrideGlobalButton.setFocus(); // must focus on something for F1 to have a topic to lanuch
- overrideGlobalButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setDoesProjectOverride(overrideGlobalButton.getSelection());
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- disableAllValidation = new Button(validatorGroup, SWT.CHECK);
- disableAllValidation.setLayoutData(data);
- disableAllValidation.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.DISABLE_VALIDATION));
- disableAllValidation.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setDisableAllValidation(disableAllValidation.getSelection());
- disableAllValidation.setFocus();
- validatorsTable.setEnabled(!disableAllValidation.getSelection());
- enableAllButton.setEnabled(!disableAllValidation.getSelection());
- disableAllButton.setEnabled(!disableAllValidation.getSelection());
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
-
-
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- messageLabel = new Label(validatorGroup, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_LBL_DESC, new String[]{getProject().getName()}));
- messageLabel.setLayoutData(listLabelData);
-
- validatorsTable = new Table(validatorGroup,SWT.BORDER | SWT.FULL_SELECTION);
- TableLayout tableLayout = new TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(160, true));
- tableLayout.addColumnData(new ColumnWeightData(40, true));
- tableLayout.addColumnData(new ColumnWeightData(30, true));
- tableLayout.addColumnData(new ColumnWeightData(40, true));
- validatorsTable.setHeaderVisible(true);
- validatorsTable.setLinesVisible(true);
- validatorsTable.setLayout(tableLayout);
-
- validatorList = new TableViewer(validatorsTable);
- GridData validatorListData = new GridData(GridData.FILL_HORIZONTAL);
- validatorListData.horizontalSpan = 2;
- validatorsTable.setLayoutData(validatorListData);
- validatorList.getTable().setLayoutData(validatorListData);
- validatorList.setLabelProvider(new ValidationLabelProvider());
- validatorList.setContentProvider(new ValidationContentProvider());
- validatorList.setSorter(new ValidationViewerSorter());
- setupTableColumns(validatorsTable,validatorList);
- validatorsTable.addMouseListener(new MouseAdapter() {
-
- public void mouseDown(MouseEvent e)
- {
- if (e.button != 1) {
- return;
- }
-
- // Handles mouse clicks in the table.
- 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);
- }
- }});
-
- validatorList.setInput(pagePreferences.getValidators());
-
- enableAllButton = new Button(validatorGroup, SWT.PUSH);
- GridData selectData = new GridData();
- enableAllButton.setLayoutData(selectData);
- enableAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_ENABLEALL));
- enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- PlatformUI.getWorkbench().getHelpSystem().setHelp(enableAllButton, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- GridData deselectData = new GridData();
- disableAllButton = new Button(validatorGroup, SWT.PUSH);
- disableAllButton.setLayoutData(deselectData);
- disableAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_DISABLEALL));
- disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- PlatformUI.getWorkbench().getHelpSystem().setHelp(disableAllButton, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData disableValidationData = new GridData(GridData.FILL_HORIZONTAL);
- disableValidationData.horizontalSpan = 2;
- addValidationBuilder = new Button(validatorGroup, SWT.CHECK);
- addValidationBuilder.setLayoutData(disableValidationData);
- addValidationBuilder.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.ADD_VALIDATION_BUILDER));
-
- // Have to set the tab order or only the first checkbox in a Composite can
- // be tab-ed to. (Seems to apply only to checkboxes. Have to use the arrow
- // key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[]{overrideGlobalButton,disableAllValidation, validatorList.getTable(), enableAllButton, disableAllButton});
-
- updateWidgets();
-
- Dialog.applyDialogFont(parent);
- page.setSize(page.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return page;
- }
-
- protected void updateTable() throws InvocationTargetException {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- if (pagePreferences.isManualEnabled(vmd))
- vmd.setManualValidation(true);
- else
- vmd.setManualValidation(false);
-
- if (pagePreferences.isBuildEnabled(vmd))
- vmd.setBuildValidation(true);
- else
- vmd.setBuildValidation(false);
- }
- validatorList.refresh();
- }
-
- protected void enableManualAndBuildValues() {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
- vmd.setManualValidation(true);
- vmd.setBuildValidation(true);
- }
- validatorList.refresh();
- }
-
- protected void disableManualAndBuildValues() {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
- vmd.setManualValidation(false);
- vmd.setBuildValidation(false);
- }
- validatorList.refresh();
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- pagePreferences.resetToDefault();
- updateWidgets();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- pagePreferences.setEnabledValidators(getEnabledValidators());
- enableManualAndBuildValues();
- enableAllButton.setFocus();
- return true;
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- pagePreferences.setEnabledValidators(getEnabledValidators());
- disableManualAndBuildValues();
- disableAllButton.setFocus();
- return true;
- }
-
- public ValidatorMetaData[] getEnabledValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isManualValidation() || validatorMetaData.isBuildValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
- }
-
- public ValidatorMetaData[] getManualEnabledValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isManualValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
- }
-
- public ValidatorMetaData[] getBuildEnabledValidators() {
- List enabledValidators = new ArrayList();
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- if(validatorMetaData.isBuildValidation())
- enabledValidators.add(validatorMetaData);
- }
- return (ValidatorMetaData[])enabledValidators.toArray(new ValidatorMetaData[enabledValidators.size()]);
- }
-
-
- /**
- *
- */
- private void setAllValidators(boolean bool) {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- ValidatorMetaData validatorMetaData = (ValidatorMetaData) items[i].getData();
- validatorMetaData.setManualValidation(bool);
- validatorMetaData.setBuildValidation(bool);
- }
- }
-
- protected Menu createContextMenu()
- {
- final Menu menu = new Menu(validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem (menu, SWT.CHECK);
- manualItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_MNU_MANUAL));
- final MenuItem buildItem = new MenuItem (menu, SWT.CHECK);
- buildItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_MNU_BUILD));
- final MenuItem settingsItem = new MenuItem (menu, SWT.PUSH);
- settingsItem.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.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();
- ValidatorMetaData vmd = (ValidatorMetaData) selection.getFirstElement();
- manualItem.setSelection(vmd.isManualValidation());
- buildItem.setSelection(vmd.isBuildValidation());
- settingsItem.setEnabled(vmd.isDelegating());
- }});
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit)
- {
- IStructuredSelection selection = (IStructuredSelection) validatorList.getSelection();
- ValidatorMetaData vmd = (ValidatorMetaData) selection.getFirstElement();
-
- switch (columnToEdit)
- {
- case 1:
- vmd.setManualValidation(!vmd.isManualValidation());
- break;
- case 2:
- vmd.setBuildValidation(!vmd.isBuildValidation());
- break;
- case 3:
- {
- if (!vmd.isDelegating()) {
- break;
- }
-
- String delegateID = pagePreferences.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)
- {
- pagePreferences.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- }
- default:
- break;
- }
- validatorList.refresh();
- }
-
- void updateWidgets() throws InvocationTargetException {
- // Since the setting of the "override" button enables/disables the other widgets on the
- // page, update the enabled state of the other widgets from the "override" button.
- updateTable();
- updateAllWidgets();
-
- }
-
- protected void updateWidgetsForDefaults() throws InvocationTargetException {
- updateTableForDefaults();
- updateAllWidgets();
- }
-
- private void updateAllWidgets() throws InvocationTargetException {
- // Since the setting of the "override" button enables/disables the other widgets on the
- // page, update the enabled state of the other widgets from the "override" button.
- ConfigurationManager prefMgr = ConfigurationManager.getManager();
- canOverride = prefMgr.getGlobalConfiguration().canProjectsOverride();
- boolean overridePreferences = canOverride && pagePreferences.doesProjectOverride();
- overrideGlobalButton.setEnabled(canOverride);
- overrideGlobalButton.setSelection(overridePreferences);
- disableAllValidation.setEnabled(overridePreferences);
- disableAllValidation.setSelection(pagePreferences.isDisableAllValidation());
- if (overridePreferences)
- enableDependentControls(!pagePreferences.isDisableAllValidation());
- else
- enableDependentControls(overridePreferences);
- setAddValidationBuilderButtonEnablement();
- updateHelp();
- }
-
- private void setAddValidationBuilderButtonEnablement() {
- try {
- boolean builderExists = false;
- 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) | isValidationBuilderEnabled(commands[i]))
- builderExists = true;
- }
- if (builderExists) {
- addValidationBuilder.setVisible(false);
- } else {
- addValidationBuilder.setVisible(true);
- addValidationBuilder.setSelection(false);
- addValidationBuilder.setEnabled(true);
- }
-
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- }
-
- private boolean isValidationBuilderEnabled(ICommand command) {
- Map args = command.getArguments();
- if(args.isEmpty())
- return false;
- String handle = (String)args.get("LaunchConfigHandle");
- if(handle != null && handle.length() > 0 && handle.indexOf(ValidationPlugin.VALIDATION_BUILDER_ID) != -1)
- return true;
- return false;
- }
-
- private void updateTableForDefaults() throws InvocationTargetException {
- TableItem[] items = validatorsTable.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- if(pagePreferences.isEnabled(vmd)) {
- vmd.setManualValidation(true);
- vmd.setBuildValidation(true);
- } else {
- vmd.setManualValidation(false);
- vmd.setBuildValidation(false);
- }
- }
- validatorList.refresh();
- }
-
- /**
- * @param overridePreferences
- */
- private void enableDependentControls(boolean overridePreferences) {
- validatorsTable.setEnabled(overridePreferences);
- validatorList.refresh();
- enableAllButton.setEnabled(overridePreferences); // since help messsage isn't
- disableAllButton.setEnabled(overridePreferences);
-
- }
-
- protected void updateHelp() throws InvocationTargetException {
- // Whenever a widget is disabled, it cannot get focus.
- // Since it can't have focus, its context-sensitive F1 help can't come up.
- // From experimentation, I know that the composite parent of the widget
- // can't have focus either. So, fudge the focus by making the table the widget
- // surrogate so that the F1 help can be shown, with its instructions on how to
- // enable the disabled widget. The table never has F1 help associated with it other
- // than the page F1, so this fudge doesn't remove any context-sensitive help
- // from the table widget.
-
- /*if (autoButton.getEnabled()) {
- // set the table's help back to what it was
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(autoButton, ContextIds.VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED);
- } else {
- // The order of the following if statement is important!
- // If the user cannot enable automatic validation on the project, then the user
- // should not be told, for example, to turn auto-build on. Let the user know that
- // no matter what they do they cannot run auto-validate on the project. IF the
- // project
- // supports auto-validate, THEN check for the items which the user can change.
- validatorList.getTable().setFocus();
- if (pagePreferences.numberOfIncrementalValidators() == 0) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG);
- } else if (!ValidatorManager.getManager().isGlobalAutoBuildEnabled()) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD);
- } else {
- // Incremental validators configured but not selected
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED);
- }
- }
-
- // if autoButton AND build button are disabled, show the build button's "to enable" text
- if (valWhenBuildButton.getEnabled()) {
- // Do NOT set the table's help back to what it was.
- // Only if auto-validate is enabled should the page go back.
- PlatformUI.getWorkbench().getHelpSystem().setHelp(valWhenBuildButton, ContextIds.VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED);
- } else {
- // page.getParent().setFocus();
- validatorList.getTable().setFocus();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED);
- }
-*/
- // if the override button is disabled, show its "to enable" text.
- if (overrideGlobalButton.getEnabled()) {
- // Do NOT set the table's help back to what it was.
- // Only if auto-validate is enabled should the page go back.
- boolean doesProjectSupportBuildValidation = ValidatorManager.doesProjectSupportBuildValidation(getProject());
- // GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- //boolean isPrefAuto = gp.isAutoValidate();
- //boolean isPrefManual = gp.isBuildValidate();
- if (doesProjectSupportBuildValidation) {
- // Project supports build validation, so it doesn't matter what the preferences
- // are
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED);
- } /*else if (!doesProjectSupportBuildValidation && (isPrefAuto && isPrefManual)) {
- // Project doesn't support build validation, and the user prefers both auto and
- // manual build validation
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH);
- } else if (!doesProjectSupportBuildValidation && isPrefAuto) {
- // Project doesn't support build validation, and the user prefers auto build
- // validation
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO);
- } else if (!doesProjectSupportBuildValidation && isPrefManual) {
- // Project doesn't support build validation, and the user prefers manual build
- // validation
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL);
- } else if (!doesProjectSupportBuildValidation && !isPrefAuto && !isPrefManual) {
- // Project doesn't support build validation, but that doesn't matter because the
- // user prefers no build validation.
- PlatformUI.getWorkbench().getHelpSystem().setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED);
- }*/
- } else {
- validatorList.getTable().setFocus();
- // Preference page doesn't allow projects to override
- PlatformUI.getWorkbench().getHelpSystem().setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE);
- }
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
- private void storeValues() throws InvocationTargetException {
- pagePreferences.setDoesProjectOverride(overrideGlobalButton.getSelection());
-
- if (pagePreferences.doesProjectOverride()) {
- pagePreferences.setEnabledManualValidators(getManualEnabledValidators());
- pagePreferences.setEnabledBuildValidators(getBuildEnabledValidators());
- } else {
- pagePreferences.resetToDefault(); // If the project can't or doesn't override,
- // update its values to match the global
- // preference values.
- }
- pagePreferences.store();
- }
-
- /**
- * Reads the list of validators, enables the validators which are selected, disables the
- * validators which are not selected, and if the auto-validate checkbox is chosen, performs
- * a full validation.
- */
- public boolean performOk() throws InvocationTargetException {
- // addBuilder MUST be called before storeValues
- // addBuilder adds a builder to the project, and that changes the project description.
- // Changing a project's description triggers the validation framework's "natureChange"
- // migration, and a nature change requires that the list of validators be recalculated.
- // If the builder is added after the values are stored, the stored values are
- // overwritten.
- addBuilder();
-
- // If this method is being called because an APPLY was hit instead of an OK,
- // recalculate the "can build be enabled" status because the builder may have
- // been added in the addBuilder() call above.
- // Also recalculate the values that depend on the isBuilderConfigured value.
- //isBuilderConfigured = ValidatorManager.doesProjectSupportBuildValidation(getProject());
-
- // Persist the values.
- storeValues();
-
- if (pagePreferences.hasEnabledValidatorsChanged(oldVmd, false) ||
- pagePreferences.haveDelegatesChanged(oldDelegates, false)) {
- // false means that the preference "allow" value hasn't changed
- ValidatorManager.getManager().updateTaskList(getProject());
- }
-
- return true;
- }
-
- /**
- * If the current project doesn't have the validation builder configured on it, add the
- * builder. Otherwise return without doing anything.
- */
- private void addBuilder() {
- if (addValidationBuilder.isEnabled() && addValidationBuilder.getSelection())
- ValidatorManager.addProjectBuildValidationSupport(getProject());
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- enableAllButton.dispose();
- disableAllButton.dispose();
- validatorList.getTable().dispose();
- messageLabel.dispose();
- // layout.dispose();
- // data.dispose();
- emptyRowPlaceholder.dispose();
- overrideGlobalButton.dispose();
- page.dispose();
- color.dispose();
- }
-
- public boolean performCancel() {
- pagePreferences.setDoesProjectOverride(existingOverrideGlobalVal);
- pagePreferences.setDisableAllValidation(existingDisableAllValidation);
- return true;
- }
- }
-
- /**
- * ValidationPreferencePage constructor comment.
- */
- public ValidationPropertiesPage() {
- // Some of the initialization is done in the "initialize" method, which is
- // called by the "getPageType" method, because the current project must
- // be known in order to initialize those fields.
- }
-
- /**
- * Given a parent (the Properties guide), create the Validators page to be added to it.
- */
- protected Control createContents(Composite parent) {
- IProject project = getProject();
-
- if ((project == null) || !project.isOpen()) {
- _pageImpl = new InvalidPage(parent);
- } else {
- try {
- if (ConfigurationManager.getManager().getProjectConfiguration(project).numberOfValidators() == 0) {
- _pageImpl = new NoValidatorsPage(parent);
- } else {
- _pageImpl = new ValidatorListPage(parent);
- }
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- return _pageImpl.getControl();
- }
-
- /**
- * 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 {
- _pageImpl.dispose();
- } catch (Exception exc) {
- logError(exc);
- }
- }
-
- /**
- * Returns the highlighted item in the workbench.
- */
- 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;
-
- }
-
- protected void noDefaultAndApplyButton() {
- super.noDefaultAndApplyButton();
- }
-
- /**
- * Performs special processing when this page's Defaults button has been pressed.
- * <p>
- * This is a framework hook method for sublcasses 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 (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Exception exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- public boolean performCancel() {
- _pageImpl.performCancel();
- return true;
- }
-
- /**
- * 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 (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- } catch (Exception exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- }
- }
-
- void logError(Throwable exc) {
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationPropertiesPage.displayAndLogError"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL_PAGE);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc instanceof InvocationTargetException) {
- if (((InvocationTargetException) exc).getTargetException() != null) {
- entry.setTargetException(((InvocationTargetException) exc).getTargetException());
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- 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.preference.PreferencePage#getDefaultsButton()
- */
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java
deleted file mode 100644
index 787ef69..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java
+++ /dev/null
@@ -1,19 +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;
-
-
-/**
- * @deprecated For use by the validation framework only.
- */
-public interface ValidationUIConstants extends org.eclipse.wst.validation.internal.ui.ResourceConstants {
- //Default
-}
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 bccdb8e..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - 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;
-
- 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 db32fa3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
+++ /dev/null
@@ -1,164 +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.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-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"};
-
- public ValidationUIPlugin() {
- super();
- if (_plugin == null) {
- _plugin = this;
- }
- }
-
- public static String getBundleName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static LogEntry getLogEntry() {
- return ValidationPlugin.getLogEntry();
- }
-
-
- 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) {
- e.printStackTrace();
- Logger logger = WTPUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("ValidationUIPlugin.getResourceString(String)"); //$NON-NLS-1$
- entry.setText("Missing resource for key" + key); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
-
- 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;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/validationui.properties b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/validationui.properties
deleted file mode 100644
index d9a8c24..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/validationui.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-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
diff --git a/plugins/org.eclipse.wst.validation/.classpath b/plugins/org.eclipse.wst.validation/.classpath
deleted file mode 100644
index 216eb7b..0000000
--- a/plugins/org.eclipse.wst.validation/.classpath
+++ /dev/null
@@ -1,13 +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="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/**"/>
- </accessrules>
- </classpathentry>
- <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 26565de..0000000
--- a/plugins/org.eclipse.wst.validation/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-com.ibm.etools.validation/debug=true
-com.ibm.etools.validation/tracefilter=
\ No newline at end of file
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 0dc0f25..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Fri Apr 13 14:18:31 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-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=warning
-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=warning
-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=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=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=warning
-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.3
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 35ee23b..0000000
--- a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Mar 29 04:07:07 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
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 66d1e4c..0000000
--- a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +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.1.102.qualifier
-Bundle-Activator: org.eclipse.wst.validation.internal.plugin.ValidationPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation.internal;x-internal:=true,
- org.eclipse.wst.validation.internal.core;x-internal:=true,
- org.eclipse.wst.validation.internal.delegates;x-internal:=true,
- org.eclipse.wst.validation.internal.operations;x-internal:=true,
- org.eclipse.wst.validation.internal.plugin;x-internal:=true,
- org.eclipse.wst.validation.internal.provisional;x-internal:=true,
- org.eclipse.wst.validation.internal.provisional.core;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.validation/about.html b/plugins/org.eclipse.wst.validation/about.html
deleted file mode 100644
index 73db36e..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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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 Redistributors 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 c12cbf5..0000000
--- a/plugins/org.eclipse.wst.validation/build.properties
+++ /dev/null
@@ -1,22 +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
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .
-jars.compile.order = .
-src.includes = component.xml,\
- xsds/
-output.. = bin/
-source.. = validate_core/,\
- property_files/,\
- validate/
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 a39e485..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-#
-# Version 1.3
-#
-VALIDATION_BUILDER_NAME=Validation
-VALIDATION_PROBLEMMARKER_NAME=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
diff --git a/plugins/org.eclipse.wst.validation/plugin.xml b/plugins/org.eclipse.wst.validation/plugin.xml
deleted file mode 100644
index 9187915..0000000
--- a/plugins/org.eclipse.wst.validation/plugin.xml
+++ /dev/null
@@ -1,114 +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="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"/>
-
-<!--============================-->
-<!-- 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>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation/prepareforpii.xml b/plugins/org.eclipse.wst.validation/prepareforpii.xml
deleted file mode 100644
index 1aad5fe..0000000
--- a/plugins/org.eclipse.wst.validation/prepareforpii.xml
+++ /dev/null
@@ -1,38 +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.etools.validation"/>
- <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_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
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 759b506..0000000
--- a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# 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_NULL_NAME=IWAE0011E Resource {0} cannot be added to file list because IWorkbenchContext.getPortableName() returns null. This resource will not be validated by the validator named {1}.
-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_RUN=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.
-VBF_EXC_SYNTAX_NO_VAL_CLASS=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.
-VBF_EXC_SYNTAX_NO_VAL_THROWABLE=IWAE0017E Cannot create validator {0} because a Throwable was caught.
-VBF_EXC_SYNTAX_NO_VAL_NULL=IWAE0018E Validator class {0} could not be created. IConfigurationElement.createExecutableExtension(String) returned null.
-
-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 107ec06..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
+++ /dev/null
@@ -1,80 +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;
-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); //$NON-NLS-1$ // 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(); //$NON-NLS-1$ // 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
- String VALIDATION_MARKER = PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$ // The extension which is used to add validation markers to the task list
- String VALIDATION_MARKER_GROUP = "groupName"; //$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_MESSAGEID = "messageId"; //$NON-NLS-1$ // Persist the message id of the message, not just the translated text.
-
- // 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 bf20dd2..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
+++ /dev/null
@@ -1,283 +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.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 inst = null;
-
- private ConfigurationManager() {
- //Default constructor
- }
-
- public static ConfigurationManager getManager() {
- if (inst == null) {
- inst = new ConfigurationManager();
- }
- return inst;
- }
-
- /**
- * 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) {
- // owner not set
- return null;
- }
- return attrib.toString();
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("InternalPreferenceManager.getValidator(IMarker)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("InternalPreferenceManager.isValidationMarker(IMarker)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return false;
- }
- }
-
- /**
- * This method is for use by the TVT Validation plugin ONLY!!! No code should access the
- * validation markers in the list directly except for the validation framework and the TVT
- * Validation plugin.
- */
- 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 exc) {
- // Couldn't retrieve the markers from the resource for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("WorkbenchMonitor.removeAllValidationMarkers(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- /**
- * This method returns the global preferences for the workspace.
- */
- public GlobalConfiguration getGlobalConfiguration() throws InvocationTargetException {
- IWorkspaceRoot root = ValidationConfiguration.getRoot();
- GlobalConfiguration gp = null;
- try {
- gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
- if (gp == null) {
- gp = new GlobalConfiguration(root);
- Preferences prefs = ValidationPlugin.getPlugin().getPluginPreferences();
- if( prefs != 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.
- */
- public void resetProjectNature(IProject project) throws InvocationTargetException {
- resetProjectNature(getProjectConfiguration(project));
- }
-
- /**
- * When a project has been created for the first time, its natures may not have been complete at
- * the time that this Preference was recreated. Call this method to recalculate the vmds.
- */
- protected void resetProjectNature(ProjectConfiguration prjp) throws InvocationTargetException {
- prjp.resetProjectNature();
- }
-
- public void closing(IProject project) {
- try {
- if (isMigrated(project)) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if(!prjp.useGlobalPreference())
- prjp.store();
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("InternalPreferenceManager::closing(" + 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);
- }
- }
- }
- }
-
- public void deleting(IProject 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(); // initialize the configuration's
- // version attribute
- return prjp.isVersionCurrent();
- }
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
- }
- return false;
- }
-
-}
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 b7d1729..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
+++ /dev/null
@@ -1,425 +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.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-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.jem.util.UIContextDetermination;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 = null;
- private boolean _shutdown = false; // false means that eclipse is not shutting down, and true
- // means that it is shutting down. Used in two methods:
- // shutdown(),and resourceChanged(IResourceChangeEvent)
- private IResourceDeltaVisitor _postAutoBuildVisitor = null;
- private boolean _isActive = false; // has the registry been read?
-
- private EventManager() {
- super();
- }
-
- public static EventManager getManager() {
- if (_inst == null) {
- _inst = new EventManager();
- }
- return _inst;
- }
-
- public void opening(IProject project) {
- if (project == null || !ValidationPlugin.isActivated()) {
- return;
- }
-
- // 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;
- }
-
- 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 plugins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
-
- 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 exc) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EventManager::closing(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
-
- continue;
- } catch (Exception exc) {
- // If there is a problem with this particular helper, log the error and
- // continue
- // with the next validator.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EventManager::closing(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- continue;
- }
- }
-
- ConfigurationManager.getManager().closing(project);
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("EventManager::closing(" + 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);
- }
- }
- }
- }
-
- public void deleting(IProject project) {
- if (project == null) {
- return;
- }
-
- 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 plugins until they're needed.
- if (isMigrated) {
- ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
-
- 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 exc) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EventManager::deleting(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
-
- continue;
- } catch (Exception exc) {
- // If there is a problem with this particular helper, log the error and
- // continue
- // with the next validator.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EventManager::deleting(IProject)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- continue;
- }
- }
-
- ConfigurationManager.getManager().deleting(project);
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("EventManager::deleting(" + 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 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 true;
-
- IResource resource = subdelta.getResource();
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if ((subdelta.getFlags() & IResourceDelta.DESCRIPTION) == IResourceDelta.DESCRIPTION) {
- try {
- // flush existing "enabled validator" settings and reset to default
- ConfigurationManager.getManager().resetProjectNature(project); //
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("EventManager::postAutoChange"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- 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);
- }
- // closing is called by PRE_CLOSE in resourceChanged
- // else {
- // closing(project);
- // }
- }
- }
-
- return true;
- }
- };
- }
-
- try {
- delta.accept(_postAutoBuildVisitor, true);
- } catch (CoreException exc) {
- exc.printStackTrace();
- }
- }
-
- /**
- * 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;
- }
-
- /*
- * StringBuffer buffer = new StringBuffer(); buffer.append("IResourceChangeEvent type = ");
- * buffer.append(event.getType()); buffer.append(", resource = ");
- * buffer.append(event.getResource()); buffer.append(", source = ");
- * buffer.append(event.getSource()); buffer.append(", delta = ");
- * buffer.append(event.getDelta()); System.out.println(buffer.toString());
- */
-
- if (event.getSource() instanceof IWorkspace) {
- if ((event.getType() == IResourceChangeEvent.PRE_DELETE) && (event.getResource() instanceof IProject)) {
- deleting((IProject) event.getResource());
- } else if ((event.getType() == IResourceChangeEvent.PRE_CLOSE) && (event.getResource() instanceof IProject)) {
- 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 plugin could not load, or that the workbench is shutting down.)
- *
- * 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 {
- _shutdown = true; // resourceChanged(IResourceChangeEvent) needs to know when a shutdown
- // has started.
-
- /*
- * if( !isHeadless() && ConfigurationManager.getManager().isGlobalMigrated()) {
- * GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- * gp.store(); // First, see if any validators are loaded. If none are, there is nothing
- * to // clean up. if(gp.numberOfValidators() == 0) { return; } }
- */
-
- // 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;
- IProject project = null;
- for (int i = 0; i < projects.length; i++) {
- project = projects[i];
- 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 plugins until they're needed.
- if (isMigrated) {
- prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- //No need to save project level validation preferences at shutdown.b
- //if(!prjp.useGlobalPreference())
- // prjp.store();
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("EventManager::shutdown(" + 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);
- }
- }
- }
- }
- } 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 plugin 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
- */
- public static boolean isHeadless() {
- boolean ret = UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
- return ret;
- //return UIContextDetermination.getCurrentContext() ==
- // UIContextDetermination.HEADLESS_CONTEXT;
- }
-}
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 3ee408d..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
+++ /dev/null
@@ -1,709 +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.text.MessageFormat;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 getResult();
-
- public void setEnabledValidators(Set enabledValidators);
-
- public void setProgressMonitor(IProgressMonitor monitor);
-
- public IProgressMonitor getProgressMonitor();
- }
-
- private interface VMDDeltaVisitor extends VMDRecorder, IResourceDeltaVisitor {
- //constructor
- }
-
- private interface VMDResourceVisitor extends VMDRecorder, IResourceVisitor {
- //constructor
- }
-
- /**
- * Don't let anyone create an instance of this class.
- */
- private FilterUtil() {
- //default
- }
-
- /**
- * Given a Set of enabled ValidatorMetaData, create a Map with each ValidatorMetaData as a key
- * with an associated null value.
- */
- static Map wrapInMap(Set enabledValidators) {
- Map result = new HashMap();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return result;
- }
-
- Iterator iterator = enabledValidators.iterator();
- while (iterator.hasNext()) {
- result.put(iterator.next(), 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 getResourceDeltas(Map enabledValidators, ValidatorMetaData vmd) {
- Set fileDeltas = (Set) enabledValidators.get(vmd);
- if (fileDeltas == null) {
- fileDeltas = new HashSet();
- 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 enabledValidators, ValidatorMetaData vmd, WorkbenchFileDelta fileDelta) {
- Set 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 getFileDeltas(Set 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 getFileDeltas(Set 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[].
- *
- * 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 getFileDeltas(Set enabledValidators, Object[] changedResources, int ifileDeltaType, boolean force) {
- Map result = new HashMap();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return result;
- }
-
- Iterator iterator = enabledValidators.iterator();
- boolean cannotLoad = false;
- IWorkbenchContext helper = null;
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- try {
- Set deltas = new HashSet();
- 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 exc) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil::getFileDeltas(Set, Object[], int, boolean)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil::getFileDelta(IWorkbenchContext, ValidatorMetaData, IResource, int)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NULL_NAME);
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NULL_NAME), new String[]{resource.getName(), vmd.getValidatorDisplayName()});
- entry.setText(result);
- //entry.setTokens(new String[]{resource.getName(), vmd.getValidatorDisplayName()});
- logger.write(Level.SEVERE, entry);
- }
-
- 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 {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil::getFileDelta(IWorkbenchContext, ValidtaorMetaData, IResource, int)"); //$NON-NLS-1$
- entry.setText("portableName is null and path is null for resource " + resource); //$NON-NLS-1$
- logger.write(Level.SEVERE, entry);
- }
- 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 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) {
- // How to log this????
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil.addToFileList"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
-
- 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).
- * <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 void filterOut(IProgressMonitor monitor, Map enabledValidators, IResource resource, int resourceDelta, boolean isFullBuild) {
- if (monitor == null) {
- return;
- }
-
- checkCanceled(monitor);
-
- Iterator iterator = enabledValidators.keySet().iterator();
- boolean cannotLoad = false;
- while (iterator.hasNext()) {
- checkCanceled(monitor);
-
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
-
- 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 exc) {
- cannotLoad = true;
-
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil::filterOut(IProgressMonitor, Map, IResource, int, boolean)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- 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 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 enabledValidators) {
- if (_resourceVisitor == null) {
- _resourceVisitor = new VMDResourceVisitor() {
- private Map _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set 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 enabledValidators) {
- if (_deltaVisitor == null) {
- _deltaVisitor = new VMDDeltaVisitor() {
- private Map _vmdDeltas = null;
- private IProgressMonitor _progressMonitor = null;
-
- public Map getResult() {
- return _vmdDeltas;
- }
-
- public void setEnabledValidators(Set 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();
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINEST)) {
- StringBuffer buffer = new StringBuffer("subdelta of "); //$NON-NLS-1$
- buffer.append(resource.getName());
- buffer.append(" is "); //$NON-NLS-1$
- buffer.append(subdelta.getKind());
- buffer.append(" resource exists? "); //$NON-NLS-1$
- buffer.append(resource.exists());
- buffer.append(" resource.isPhantom?"); //$NON-NLS-1$
- buffer.append(resource.isPhantom());
-
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("FilterUtil::visit(IResourceDelta)"); //$NON-NLS-1$
- entry.setText(buffer.toString());
- logger.write(Level.FINEST, entry);
- }
-
- }
-
- // 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 loadDeltas(final IProgressMonitor monitor, final Set 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 loadDeltas(final IProgressMonitor monitor, final Set 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 85037b7..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
+++ /dev/null
@@ -1,215 +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.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.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 exc) {
- // Can't find the IMarker? Assume it's deleted.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("GlobalConfiguration.getMarker()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("GlobalConfiguration.loadV50"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- 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 476cda8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
+++ /dev/null
@@ -1,204 +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.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 wrapInSet(Object[] obj) {
- Set result = new HashSet();
- if ((obj == null) || (obj.length == 0)) {
- return result;
- }
-
- for (int i = 0; i < obj.length; i++) {
- result.add(obj[i]);
- }
-
- 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 temp = new HashSet();
- for (int i = 0; i < vmds.length; i++) {
- String[] names = vmds[i].getValidatorNames();
- for (int j = 0; j < names.length; j++) {
- temp.add(names[j]);
- }
- }
-
- 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 vmds) {
- Set temp = new HashSet();
- Iterator iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- String[] names = vmd.getValidatorNames();
- for (int j = 0; j < names.length; j++) {
- temp.add(names[j]);
- }
- }
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("InternalValidatorManager::getValidatorsForExtension(" + project.getName() + ", " + fileExtension + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- 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 b1e53ff..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
+++ /dev/null
@@ -1,656 +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.lang.reflect.InvocationTargetException;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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;
- 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.)
- */
- public ProjectConfiguration(ProjectConfiguration original) throws InvocationTargetException {
- super();
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ProjectConfiguration.userGlobalPreference"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return false;
- }
- }
-
- 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();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.ValidationConfiguration#getDelegatingValidators()
- */
- public Map 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.
- */
- 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 exc) {
- // Can't find the IMarker? Assume it's deleted.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ProjectConfiguration::getMarker"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ProjectConfiguration.loadMarker "); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ProjectConfiguration.loadMarker InvocationTargetException"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- 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 oldDelegates, boolean allow) throws InvocationTargetException {
-
- if (super.haveDelegatesChanged(oldDelegates)) {
- return true;
- }
-
- if (allow) {
- Map projDelegates = super.getDelegatingValidators();
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- return gp.haveDelegatesChanged(projDelegates);
- }
-
- return false;
- }
-
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#deserialize(String)
- */
- public void deserialize(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals("default_value")) {
- 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());
- }
- }
- }
-
- /**
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#serialize()
- */
- 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();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledFullBuildValidators(boolean)
- */
- 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();
- IScopeContext projectContext = new ProjectScope(project);
- final IEclipsePreferences pref = projectContext.getNode(ValidationPlugin.PLUGIN_ID);
- if (pref != null) {
- try {
- pref.put(USER_PREFERENCE, serialize());
- pref.put(USER_MANUAL_PREFERENCE, serializeManualSetting());
- pref.put(USER_BUILD_PREFERENCE, serializeBuildSetting());
- pref.put(DELEGATES_PREFERENCE, serializeDelegatesSetting());
- pref.flush();
- } catch (BackingStoreException bse) {
- Logger.getLogger().log(bse);
- }
- }
- }
-
- protected void loadPreference() throws InvocationTargetException {
- IProject project = (IProject) getResource();
- IScopeContext projectContext = new ProjectScope(project);
- final IEclipsePreferences prefs = projectContext.getNode(ValidationPlugin.PLUGIN_ID);
- if (prefs != null) {
- String storedConfig = prefs.get(USER_PREFERENCE,"default_value");
- deserialize(storedConfig);
- String storedManualConfig = prefs.get(USER_MANUAL_PREFERENCE,"default_value");
- deserializeManual(storedManualConfig);
- String storedBuildConfig = prefs.get(USER_BUILD_PREFERENCE,"default_value");
- deserializeBuild(storedBuildConfig);
- String storedDelegatesConfiguration = prefs.get(DELEGATES_PREFERENCE,"default_value");
- deserializeDelegates(storedDelegatesConfiguration);
- }
- }
-}
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 06652d8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
+++ /dev/null
@@ -1,88 +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
- *******************************************************************************/
-/*
- * 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.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-
-/**
- * @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) {
- Logger.getLogger().logError(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 0312a51..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
+++ /dev/null
@@ -1,120 +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
- *******************************************************************************/
-/*
- * 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.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * @author vijayb
- */
-public class ReferencialFileValidatorRegistryReader extends RegistryReader {
- static ReferencialFileValidatorRegistryReader instance = null;
- protected List referencialFileValidationExtensions;
-
- public ReferencialFileValidatorRegistryReader() {
- super(ValidationPlugin.PLUGIN_ID, "referencialFileValidator"); //$NON-NLS-1$
- }
-
- /*
- * (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;
- List extensions = getReferencialFileValidationExtensions();
- Iterator it = extensions.iterator();
- while(it.hasNext()) {
- ReferencialFileValidatorExtension ext = (ReferencialFileValidatorExtension)it.next();
- 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();
- referencialFileValidationExtensions.add(newExtension);
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public ReferencialFileValidator getReferencialFileValidator() {
- ReferencialFileValidatorExtension refFileValExt;
- for (Iterator refFileValItr = getReferencialFileValidationExtensions().iterator(); refFileValItr.hasNext();) {
- refFileValExt = (ReferencialFileValidatorExtension) refFileValItr.next();
- 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 getReferencialFileValidationExtensions() {
- if (referencialFileValidationExtensions == null)
- referencialFileValidationExtensions = new ArrayList();
- 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 89e6cbb..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
+++ /dev/null
@@ -1,123 +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;
-
-
-
-/**
- * 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 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 occured 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 validtaion, 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_NULL_NAME = "VBF_EXC_SYNTAX_NULL_NAME"; //$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_RUN = "VBF_EXC_SYNTAX_NO_VAL_RUN"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_VAL_CLASS = "VBF_EXC_SYNTAX_NO_VAL_CLASS"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_VAL_THROWABLE = "VBF_EXC_SYNTAX_NO_VAL_THROWABLE"; //$NON-NLS-1$
- String VBF_EXC_SYNTAX_NO_VAL_NULL = "VBF_EXC_SYNTAX_NO_VAL_NULL"; //$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 7e4ef28..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.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 java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.getBundleName());
- } catch (MissingResourceException exc) {
- _bundle = null;
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.internal.ResourceHandler.getBundle()"); //$NON-NLS-1$
- entry.setText("Cannot find bundle " + ValidationPlugin.getBundleName()); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- }
- return _bundle;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- ResourceBundle bundle = getBundle();
- if (bundle == null) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.internal.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Resource bundle is null"); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
- return key;
- }
-
- return bundle.getString(key);
- } catch (NullPointerException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- return key;
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), parms);
- } catch (MissingResourceException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.internal.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- } catch (NullPointerException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.internal.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- 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 05f096b..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
+++ /dev/null
@@ -1,571 +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.Map;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.
- */
- 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;
- 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 {
- 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 = 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;
- }
-
- /**
- * 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.isOwner(IMarker, ownerId)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return false;
- }
- }
-
- private static IMarker[] getValidationTasks(IResource resource, int severity, int depth) {
- IMarker[] tempMarkers = null;
- int validCount = 0;
- try {
- IMarker[] allMarkers = null;
- try {
- allMarkers = resource.findMarkers(VALIDATION_MARKER, true, depth); // false means
- // only consider
- // PROBLEM_MARKER,
- // not variants
- // of
- // PROBLEM_MARKER.
- // Since addTask
- // only adds
- // PROBLEM_MARKER,
- // we don't need
- // to consider
- // its subtypes.
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.getValidationTasks(IResource, int)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return NO_MARKERS;
- }
-
- // Now filter in the markers, based on severity type.
- if (allMarkers.length != 0) {
- tempMarkers = new IMarker[allMarkers.length];
- for (int i = 0; i < allMarkers.length; i++) {
- IMarker marker = allMarkers[i];
- Integer filterSeverity = (Integer) marker.getAttribute(VALIDATION_MARKER_SEVERITY);
- 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 {
- marker.setAttribute(IMarker.SEVERITY, getSeverity(severity));
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.getValidationTasks(int, IResource, int)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- continue;
- } catch (Exception exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.getValidationTasks(int, IResource, int)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- continue;
- }
- } else if ((severity & filterSeverity.intValue()) == 0) {
- continue;
- }
- tempMarkers[validCount++] = marker;
- }
- }
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.getValidationTasks(int, IResource, int)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
-
- 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 (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
-
- try {
- Object owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
- if ((owner == null) || !(owner instanceof String)) {
- // The ValidationMigrator will remove any "unowned" validation markers.
- continue;
- }
-
- for (int j = 0; j < messageOwners.length; j++) {
- String messageOwner = messageOwners[j];
- if (((String) owner).equals(messageOwner)) {
- temp[validCount++] = marker;
- break;
- }
- }
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("TaskListUtility.getValidationTasks(project, String[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- // Couldn't remove the task from the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchMonitor.removeAllMessages(String[], IResource, String)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- /**
- * 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/TimeEntry.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TimeEntry.java
deleted file mode 100644
index da55279..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TimeEntry.java
+++ /dev/null
@@ -1,102 +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.jem.util.logger.LogEntry;
-
-
-/**
- * This class should be used when logging "elapsed time" information and nothing else. Instead of
- * creating a new instance of this class every time it is needed, for performance reasons, create an
- * instance and reuse it. The text in this class is never translated.
- */
-public class TimeEntry extends LogEntry {
- private String _toolName;
- private String _details;
- private String _projectName;
- private String _sourceId;
- private int _executionMap;
-
- public TimeEntry() {
- super();
- }
-
- /**
- * The name of the tool (e.g., a validator, a builder) whose time is measured.
- */
- public String getToolName() {
- return _toolName;
- }
-
- public void setToolName(String name) {
- _toolName = name;
- }
-
-
- /**
- * If there are any details that need to be recorded about the tool, such as what input it runs
- * on, this field stores the value. This field is optional.
- */
- public String getDetails() {
- return _details;
- }
-
- public void setDetails(String d) {
- _details = d;
- }
-
- /**
- * The name of the project on which the tool ran.
- */
- public String getProjectName() {
- return _projectName;
- }
-
- public void setProjectName(String name) {
- _projectName = name;
- }
-
- /**
- * The id of the code that launched the tool.
- */
- public String getSourceID() {
- return _sourceId;
- }
-
- public void setSourceID(String id) {
- _sourceId = id;
- }
-
- /**
- * If, in addition to elapsed time, the tool needs to track the execution path of a method, this
- * field stores the hexadecimal number that tracks the path. See ValidationBuilder::build for an
- * example that uses an execution path.
- */
- public int getExcecutionMap() {
- return _executionMap;
- }
-
- public void setExecutionMap(int map) {
- _executionMap = map;
- }
-
- /**
- * Clear all of the fields back to their initial setting so that this TimeEntry instance can be
- * reused.
- */
- public void reset() {
- _toolName = null;
- _details = null;
- _projectName = null;
- _sourceId = null;
- _executionMap = 0;
- }
-}
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 77a738a..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
+++ /dev/null
@@ -1,169 +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.Vector;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("VThreadManager::validationRunnable"); //$NON-NLS-1$
- entry.setText("restart = " + restart); //$NON-NLS-1$
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- // This exception is added as FINE instead of SEVERE because it's not
- // improbable
- // that an exception will be thrown
- restart++;
- getJobs().setActive(false);
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("VThreadManager::validationRunnable"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- } 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 __jobs = null; // The queued Runnables that need to be run.
- private boolean _isActive = false; // Is a job being run in the validation thread?
-
- public Jobs() {
- __jobs = new Vector();
- }
-
- 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
- __jobs.add(runnable);
- notifyAll();
- }
-
- /**
- * Pop the Runnable off of the head of the queue.
- */
- synchronized Runnable dequeue() {
- while (__jobs.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 (__jobs.size() > 0) {
- job = (Runnable) __jobs.get(0);
- if (job != null) {
- __jobs.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 ((__jobs.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 0ccbcf9..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
+++ /dev/null
@@ -1,1123 +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.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-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 java.util.StringTokenizer;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * 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 IResource _resource;
- private boolean disableAllValidation = getDisableAllValidation();
- private String _version;
- private Map _validators; // Map of all validators (ValidatorMetaData) configured on the
- // project or installed globally. The value is a Boolean; TRUE
- // means that the VMD is enabled, FALSE means that the VMD is
- // disabled.
- protected HashMap manualValidators;
- protected HashMap buildValidators;
- protected String USER_PREFERENCE = "USER_PREFERENCE";
- protected String USER_MANUAL_PREFERENCE = "USER_MANUAL_PREFERENCE";
- protected String USER_BUILD_PREFERENCE = "USER_BUILD_PREFERENCE";
- protected String DELEGATES_PREFERENCE = "DELEGATES_PREFERENCE";
-
- private Map _delegatesByTarget;
-
- public static String getEnabledElementsAsString(Set elements) {
- if (elements == null) {
- return null;
- }
-
- StringBuffer buffer = new StringBuffer();
- Iterator iterator = elements.iterator();
- while (iterator.hasNext()) {
- buffer.append(((ValidatorMetaData) iterator.next()).getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- private boolean getDisableAllValidation() {
- return false;
- }
-
- public static String getEnabledElementsAsString(Object[] elements) {
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < elements.length; i++) {
- buffer.append(((ValidatorMetaData) elements[i]).getValidatorUniqueName());
- buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
- }
- return buffer.toString();
- }
-
- public static Set getStringAsEnabledElements(String elements) {
- if (elements == null) {
- return null;
- }
-
- HashSet result = new HashSet();
- 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;
- }
-
- public static IWorkspaceRoot getRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- protected ValidationConfiguration() throws InvocationTargetException {
- _validators = new HashMap();
- _delegatesByTarget = new HashMap();
- }
-
- protected ValidationConfiguration(IResource resource, ValidatorMetaData[] validators) throws InvocationTargetException {
- this();
-
- if (resource == null) {
- throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLCREATE));
- }
-
- setResource(resource);
- setValidators(validators);
- }
-
- private void setResource(IResource resource) {
- _resource = resource;
- }
-
- 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() ){
- ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
- Iterator iterator = getBuildEnabledValidatorsMap().keySet().iterator();
-
-
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- Boolean bvalue = (Boolean)(getBuildEnabledValidatorsMap().get(vmd));
- if (bvalue.booleanValue() == true) {
- // 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 all = getValidatorMetaData();
- Iterator iterator = all.keySet().iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- all.put(vmd, Boolean.FALSE);
- }
-
- // Then enable only the validators in the array
- if ((vmds == null) || (vmds.length == 0)) {
- return;
- }
- for (int i = 0; i < vmds.length; i++) {
- all.put(vmds[i], Boolean.TRUE);
- }
- }
-
- public void setEnabledManualValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- List manualEnabledVMDList = Arrays.asList(vmds);
- List allValidators = Arrays.asList(getValidators());
- for(int i = 0; i < allValidators.size(); i++) {
- ValidatorMetaData data = (ValidatorMetaData) allValidators.get(i);
- if(manualEnabledVMDList.contains(data))
- getManualEnabledValidatorsMap().put(data, new Boolean(true));
- else
- getManualEnabledValidatorsMap().put(data, new Boolean(false));
-
- }
- }
-
- public void setEnabledBuildValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
- List buildEnabledVMDList = Arrays.asList(vmds);
- List allValidators = Arrays.asList(getValidators());
- for(int i = 0; i < allValidators.size(); i++) {
- ValidatorMetaData data = (ValidatorMetaData) allValidators.get(i);
- if(buildEnabledVMDList.contains(data))
- getBuildEnabledValidatorsMap().put(data, new Boolean(true));
- else
- getBuildEnabledValidatorsMap().put(data, new Boolean(false));
-
- }
- }
-
- private Map 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()];
- Iterator iterator = getValidatorMetaData().keySet().iterator();
- int count = 0;
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- Boolean bvalue = (Boolean) 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 {
- HashMap map = getManualEnabledValidatorsMap();
- Set set = getManualEnabledValidatorsMap().keySet();
- if (!set.isEmpty()) {
- Iterator it = set.iterator();
- List enabledManualValidators = new ArrayList();
- while (it.hasNext()) {
- ValidatorMetaData data = (ValidatorMetaData) it.next();
- Boolean obj = (Boolean) map.get(data);
- if (obj != null && obj.booleanValue() == true) {
- enabledManualValidators.add(data);
- }
- }
- return (ValidatorMetaData[]) enabledManualValidators.toArray(new ValidatorMetaData[enabledManualValidators.size()]);
- }
- return getEnabledValidators();
- }
-
- public ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
- HashMap map = getBuildEnabledValidatorsMap();
- Set set = getBuildEnabledValidatorsMap().keySet();
- Iterator it = set.iterator();
- List enabledBuildValidators = new ArrayList();
- if (!set.isEmpty()) {
- while (it.hasNext()) {
- ValidatorMetaData data = (ValidatorMetaData) it.next();
- Boolean obj = (Boolean) map.get(data);
- if (obj != null && obj.booleanValue() == true) {
- enabledBuildValidators.add(data);
- }
- }
- return (ValidatorMetaData[]) enabledBuildValidators.toArray(new ValidatorMetaData[enabledBuildValidators.size()]);
- }
- return getEnabledValidators();
- }
-
- protected HashMap getBuildEnabledValidatorsMap() {
- if(buildValidators == null)
- buildValidators = new HashMap();
- return buildValidators;
- }
-
- protected HashMap getManualEnabledValidatorsMap() {
- if(manualValidators == null)
- manualValidators = new HashMap();
- 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()];
- Iterator iterator = getValidatorMetaData().keySet().iterator();
- int count = 0;
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- Boolean bvalue = (Boolean) getValidatorMetaData().get(vmd);
- if (bvalue.booleanValue() == true) {
- // If the validator is enabled
- if (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 (int i = 0; i < vmds.length; i++) {
- if (vmds[i] == null)
- continue;
- _validators.put(vmds[i], (vmds[i].isEnabledByDefault() ? Boolean.TRUE : Boolean.FALSE));
- }
- }
-
- public void setDefaultDelegates(ValidatorMetaData[] vmds) throws InvocationTargetException {
- _delegatesByTarget.clear();
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- 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 (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
- 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;
- }
-
- /*public int getMaximumNumberOfMessages() throws InvocationTargetException {
- return _maxMessages;
- }
-
- public void setMaximumNumberOfMessages(int max) {
- _maxMessages = max;
- }*/
-
- /**
- * 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.
- */
- 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 = (Boolean) 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 c) {
- int length = (c == null) ? 0 : c.size();
- ValidatorMetaData[] result = new ValidatorMetaData[length];
- if (length == 0) {
- return result;
- }
-
- Iterator iterator = c.iterator();
- int count = 0;
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- 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 {
- Preferences pref = ValidationPlugin.getPlugin().getPluginPreferences();
- if (pref != null) {
- try {
- OutputStream os = new ByteArrayOutputStream();
- pref.setValue(USER_PREFERENCE, serialize());
- pref.store(os, USER_PREFERENCE);
- pref.setValue(USER_MANUAL_PREFERENCE, serializeManualSetting());
- pref.store(os, USER_MANUAL_PREFERENCE);
- pref.setValue(USER_BUILD_PREFERENCE, serializeBuildSetting());
- pref.store(os, USER_BUILD_PREFERENCE);
- pref.setValue(DELEGATES_PREFERENCE, serializeDelegatesSetting());
- pref.store(os, DELEGATES_PREFERENCE);
- } catch (IOException ie) {
- Logger.getLogger().log(ie);
- }
-
- }
- }
-
- /**
- * 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationConfiguration::getValue(" + attribName + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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.
- Preferences prefs = ValidationPlugin.getPlugin().getPluginPreferences();
- if (prefs != null) {
- deserializeAllPrefs(prefs);
- }
- }
-
- /**
- * @param prefs
- * @throws InvocationTargetException
- */
- private void deserializeAllPrefs(Preferences prefs) throws InvocationTargetException {
- String storedConfig = prefs.getString(USER_PREFERENCE);
- deserialize(storedConfig);
- String storedManualConfig = prefs.getString(USER_MANUAL_PREFERENCE);
- deserializeManual(storedManualConfig);
- String storedBuildConfig = prefs.getString(USER_BUILD_PREFERENCE);
- deserializeBuild(storedBuildConfig);
- String storedDelegatesConfiguration = prefs.getString(DELEGATES_PREFERENCE);
- 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 ie) {
- Logger.getLogger().log(ie);
- }
- }
- }
-
- private void deserializeAllPrefs(PropertyChangeEvent event) throws InvocationTargetException {
- String storedConfig = (String)event.getNewValue();
- if( event.getProperty().equals(USER_PREFERENCE) ){
- deserialize(storedConfig);
- }else if(event.getProperty().equals(USER_MANUAL_PREFERENCE)){
- deserializeManual(storedConfig);
- }else if(event.getProperty().equals(USER_BUILD_PREFERENCE)){
- deserializeBuild(storedConfig);
- }else if(event.getProperty().equals(DELEGATES_PREFERENCE)){
- deserializeDelegates(storedConfig);
- }
- }
-
-
- protected void deserializeBuild(String storedConfiguration) throws InvocationTargetException {
- if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals("default_value")) {
- // 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("default_value")) {
- // 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("default_value")) {
- // 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.setResource(getResource());
- up.setValidators(getValidators());
- up.setDisableAllValidation(isDisableAllValidation());
- up.setEnabledValidators(getEnabledValidators());
- up.setEnabledManualValidators(getManualEnabledValidators());
- up.setEnabledBuildValidators(getBuildEnabledValidators());
- up.setDelegatingValidators(getDelegatingValidators());
- }
-
- public Map getDelegatingValidators() throws InvocationTargetException {
- return _delegatesByTarget;
- }
-
- public void setDelegatingValidators(Map 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 oldDelegates) throws InvocationTargetException {
-
- if (oldDelegates == null) {
- return true;
- }
-
- Iterator iterator = oldDelegates.keySet().iterator();
-
- while (iterator.hasNext())
- {
- String targetID = (String) iterator.next();
- String oldDelegateID = (String) oldDelegates.get(targetID);
- String newDelegateID = (String) _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) {
-
- StringBuffer buffer = new StringBuffer();
- Iterator iterator = validatorMetaData.keySet().iterator();
-
- while (iterator.hasNext()) {
-
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- 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.
- *
- * @param vmd the delegating validator's metadata. Must not be null.
- * @return a String with the unique name (ID) of the validator delegate, null if there isn't one.
- */
- public String getDelegateUniqueName(ValidatorMetaData vmd) {
- String targetID = vmd.getValidatorUniqueName();
- return (String) _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("default_value")) {
- // 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 = (Boolean) getManualEnabledValidatorsMap().get(vmd);
- if (value == null)
- return false;
- return value.booleanValue();
- }
-
- public boolean isBuildEnabled(ValidatorMetaData vmd) {
- if (vmd == null) {
- return false;
- }
- Boolean value = (Boolean) getBuildEnabledValidatorsMap().get(vmd);
- if (value == null)
- return false;
- return value.booleanValue();
- }
-
- public int numberOfManualEnabledValidators() throws InvocationTargetException {
- return getManualEnabledValidators().length;
- }
-
- public void enableSingleValidator(ValidatorMetaData vmd){
- Map all = getValidatorMetaData();
- all.put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleValidator(ValidatorMetaData vmd){
- Map all = getValidatorMetaData();
- all.put(vmd, Boolean.FALSE);
- }
-
- public void enableSingleManualValidator(ValidatorMetaData vmd){
- Map manVal = getManualEnabledValidatorsMap();
- manVal.put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleManualValidator(ValidatorMetaData vmd){
- Map manVal = getManualEnabledValidatorsMap();
- manVal.put(vmd, Boolean.FALSE);
- }
-
-
- public void enableSingleBuildValidator(ValidatorMetaData vmd){
- Map buildVal = getBuildEnabledValidatorsMap();
- buildVal.put(vmd, Boolean.TRUE);
- }
-
-
- public void disableSingleBuildValidator(ValidatorMetaData vmd){
- Map buildVal = getBuildEnabledValidatorsMap();
- buildVal.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 971a6b1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
+++ /dev/null
@@ -1,1532 +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.text.MessageFormat;
-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.Set;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-
-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.Platform;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.
- *
- * No Validator should need to know about this class. The only class which should call
- * ValidationRegistryReader is ValidatorManager.
- *
- * The Validator itself is initialized in the "initializeValidator" method.
- *
- * <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>
- */
-public final class ValidationRegistryReader implements RegistryConstants {
- private static ValidationRegistryReader inst;
- private HashMap _validators; // list of all validators registered, with their associated
- // ValidatorMetaData, indexed by project nature id
- private HashMap _indexedValidators; // 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 Set _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.
-
- public HashMap projectValidationMetaData;
-
- /**
- * The registry is read once - when this class is instantiated.
- */
- private ValidationRegistryReader() {
- super();
-
- try {
- _validators = new HashMap();
- _indexedValidators = new HashMap();
- _defaultEnabledValidators = new HashSet();
-
- // 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- /**
- * 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() {
- Iterator iterator = _indexedValidators.values().iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- 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 exlcude.
- _validators.remove(EXCLUDED_PROJECT);
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.buildCache()"); //$NON-NLS-1$
- entry.setText(debug());
- logger.write(Level.FINEST, entry);
- }
-
- }
-
- /**
- * 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 excludedProjVmds = (Set) _validators.get(EXCLUDED_PROJECT);
- if (excludedProjVmds == null) {
- // no excluded project natures
- return;
- }
-
- Iterator exIterator = excludedProjVmds.iterator();
- while (exIterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) exIterator.next();
-
- boolean noneIncluded = true; // assume that, by default, if someone explicitly excludes
- // a project nature then they don't include any project
- // natures
- Set keys = _validators.keySet();
- Iterator iterator = keys.iterator();
- while (iterator.hasNext()) {
- String projId = (String) iterator.next();
- 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 anyProjVmds = (Set) _validators.get(UNKNOWN_PROJECT);
- if (anyProjVmds == null) {
- // no validators run on all projects
- return;
- }
-
- Set keys = _validators.keySet();
- Iterator iterator = keys.iterator();
- while (iterator.hasNext()) {
- String projId = (String) iterator.next();
- 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 vmdList) {
- if ((vmdList == null) || (vmdList.size() == 0)) {
- return;
- }
-
- Set pnVal = createSet(projectNatureId); // whether the validator includes or excludes this
- // project nature id, make sure that an entry is
- // created for it in the table
- pnVal.addAll(vmdList);
- _validators.put(projectNatureId, pnVal);
- }
-
- private void add(String projectNatureId, ValidatorMetaData vmd) {
- if (vmd == null) {
- return;
- }
-
- Set pnVal = createSet(projectNatureId); // whether the validator includes or excludes this
- // project nature id, make sure that an entry is
- // created for it in the table
- 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.
- Object[] keys = _validators.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- Object key = keys[i];
- Set value = (Set) _validators.get(key);
- if (value == null) {
- continue;
- }
-
- if (value.contains(vmd)) {
- value.remove(vmd);
- _validators.put(key, value);
- }
- }
- }
-
- private Set createSet(String projNature) {
- Set v = (Set) _validators.get(projNature);
- if (v == null) {
- v = new HashSet();
- }
- 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);
- }
-
- /* package */static IWorkbenchContext createHelper(IConfigurationElement element, String helperClassName) {
- IWorkbenchContext wh = null;
- try {
- wh = (IWorkbenchContext) element.createExecutableExtension(TAG_HELPER_CLASS);
- } catch (Exception exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.createHelper(IConfigurationElement, String)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_SYNTAX_NO_HELPER_THROWABLE);
- entry.setTargetException(exc);
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_HELPER_THROWABLE), new String[]{helperClassName});
- entry.setText(result);
- //entry.setTokens(new String[]{helperClassName});
- logger.write(Level.SEVERE, entry);
- }
- return null;
- }
- return wh;
- }
-
- /* package */static IValidator createValidator(IConfigurationElement element, String validatorClassName) {
- IValidator validator = null;
- try {
- validator = (IValidator) element.createExecutableExtension(ATT_CLASS);
- } catch (Exception exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.createValidator(IConfigurationElement, String, String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_THROWABLE);
- //entry.setTokens(new String[]{validatorClassName});
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_THROWABLE), new String[]{validatorClassName});
- entry.setText(result);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
-
- if (validator == null) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.createValidator(IConfigurationElement, String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_NULL);
- entry.setTokens(new String[]{validatorClassName});
- logger.write(Level.FINE, entry);
- }
- 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, ValidatorMetaData vmd) {
- 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 = vmd.new 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() {
- if (inst == null) {
- inst = new ValidationRegistryReader();
-
- EventManager.getManager().setActive(true);
- }
- 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(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.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorExtensionPoint()"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_MISSING_VALIDATOR_EP);
- //entry.setTokens(new String[]{ValidationPlugin.PLUGIN_ID + "." + VALIDATOR_EXT_PT_ID}); //$NON-NLS-1$
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MISSING_VALIDATOR_EP),
- new String[]{ValidationPlugin.PLUGIN_ID + "." + VALIDATOR_EXT_PT_ID});
- entry.setText(result);
- logger.write(Level.FINE, entry);
- }
- }
- 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) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(IValidator)"); //$NON-NLS-1$
- entry.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{"null"})); //$NON-NLS-1$
- logger.write(Level.SEVERE, entry);
- }
- 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.
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(IValidator)"); //$NON-NLS-1$
- entry.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{validatorClassName}));
- logger.write(Level.SEVERE, entry);
- }
- return null;
- }
-
- public Set getValidatorMetaData(IWorkspaceRoot root) {
- // Every validator on the Preferences page must be returned
- Set copy = new HashSet();
- 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 getValidatorMetaData(IProject project) {
- Set copy = new HashSet();
- getValidatorMetaData(project, copy);
- return copy;
- }
-
- /**
- * Copy the set of configured validator metadata into the Set.
- */
- public void getValidatorMetaData(IProject project, Set vmds) {
- if (vmds == null) {
- return;
- }
- vmds.clear();
- int executionMap = 0x0;
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- try {
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(IProject)"); //$NON-NLS-1$
- entry.setText("IProject is " + String.valueOf(project)); //$NON-NLS-1$
- logger.write(Level.FINEST, entry);
- }
- if (project == null) {
- executionMap |= 0x1;
- // vmds is already clear
- return;
- }
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException exc) {
- executionMap |= 0x2;
- // vmds is already clear
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- entry.setExecutionMap(executionMap);
- logger.write(Level.SEVERE, entry);
- }
- 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 validatorsWithEnablementExpression = new HashSet();
- Iterator allValidators = getAllValidators().iterator();
- while (allValidators.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) allValidators.next();
- 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 (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(IProject)"); //$NON-NLS-1$
- // entry.setTokens(projectNatures);
- entry.setText(projectNatures.toString());
- logger.write(Level.FINEST, entry);
- }
- 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 (logger.isLoggingLevel(Level.FINER)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(IProject)"); //$NON-NLS-1$
- entry.setExecutionMap(executionMap);
-
- StringBuffer buffer = new StringBuffer();
- Iterator iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- entry.setText(buffer.toString());
- logger.write(Level.FINER, entry);
- }
- }
- }
-
- /**
- * @param project
- * @param vmds
- * @param projectNatures
- */
- private void calculateVmdsForNatureAndFacets(Set vmds, String[] projectNatures, IProject project) {
- Set projVmds;
- String[] projectFacetIds = getProjectFacetIds(project);
- Iterator allValidators = getAllValidators().iterator();
- while (allValidators.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) allValidators.next();
- if (containsProjectFacet(vmd, projectFacetIds) || isFacetEnabled(vmd, project)) {
- vmds.add(vmd);
- }
- }
- for (int i = 0; i < projectNatures.length; i++) {
- String projectNatureId = projectNatures[i];
- projVmds = (Set) _validators.get(projectNatureId);
- if (projVmds == null)
- continue;
-
- Iterator iterator = projVmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- 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 vmds) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.removeExcludedProjects"); //$NON-NLS-1$
-
- StringBuffer buffer = new StringBuffer("\nBefore:\n"); //$NON-NLS-1$
- Iterator viterator = vmds.iterator();
- while (viterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) viterator.next();
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- entry.setText(buffer.toString());
- logger.write(Level.FINEST, entry);
- }
-
- String[] projectNatures = null;
- try {
- projectNatures = project.getDescription().getNatureIds();
- } catch (CoreException exc) {
- // if there's no natures, there's no list.
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.getValidatorMetaData(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 iterator = vmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- ValidatorNameFilter[] natureFilters = vmd.getProjectNatureFilters();
- if (natureFilters == null) {
- // Can run on any project
- continue;
- }
-
- for (int j = 0; j < natureFilters.length; j++) {
- ValidatorNameFilter pn = natureFilters[j];
- if (nature.equals(pn.getNameFilter()) && !pn.isInclude()) {
- iterator.remove();
- break;
- }
- }
- }
- }
-
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.removeExcludedProjects"); //$NON-NLS-1$
-
- StringBuffer buffer = new StringBuffer("\nAfter:\n"); //$NON-NLS-1$
- Iterator viterator = vmds.iterator();
- while (viterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) viterator.next();
- buffer.append(vmd.getValidatorUniqueName());
- buffer.append("\n"); //$NON-NLS-1$
- }
- entry.setText(buffer.toString());
- logger.write(Level.FINEST, entry);
- }
- }
-
- private Collection clone(Collection input, Collection copy) {
- if (input == null) {
- return null;
- }
-
- if (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$
- Iterator viterator = _validators.keySet().iterator();
- while (viterator.hasNext()) {
- String projId = (String) viterator.next();
- buffer.append("projId: "); //$NON-NLS-1$
- buffer.append(projId);
- buffer.append("\n"); //$NON-NLS-1$
- Set validators = (Set) _validators.get(projId);
- Iterator innerIterator = validators.iterator();
- while (innerIterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) innerIterator.next();
- 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$
- viterator = _indexedValidators.values().iterator();
- while (viterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) viterator.next();
- 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) {
- if (projectValidationMetaData == null)
- projectValidationMetaData = new HashMap();
-
- Object vmds = projectValidationMetaData.get(project);
- if (vmds != null) {
- Set pvmds = (Set) vmds;
- return pvmds.contains(vmd);
- } else {
- Set prjVmds = getValidatorMetaData(project);
- if (prjVmds == null) {
- return false;
- }
-
- if (prjVmds.size() == 0) {
- return false;
- }
- projectValidationMetaData.put(project, prjVmds);
- return prjVmds.contains(vmd);
- }
- }
-
- /**
- * 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 getValidatorMetaDataUnknownProject() {
- Set projVmds = (Set) _validators.get(UNKNOWN_PROJECT);
- if (projVmds == null) {
- projVmds = Collections.EMPTY_SET;
- }
- return projVmds;
- }
-
- /**
- * Return a set of ValidatorMetaData which are enabled by default.
- */
- public Set getValidatorMetaDataEnabledByDefault() {
- Set copy = new HashSet();
- 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 vmd = (ValidatorMetaData) _indexedValidators.get(validatorClassName);
- if (vmd != null) {
- return vmd;
- }
-
- // Check for an aggregate validator
- Iterator iterator = _indexedValidators.values().iterator();
- while (iterator.hasNext()) {
- vmd = (ValidatorMetaData) iterator.next();
- if (vmd == null) {
- continue;
- }
-
- if (vmd.getValidatorUniqueName().equals(validatorClassName)) {
- return vmd;
- }
-
- String[] aggregateNames = vmd.getAggregatedValidatorNames();
- if (aggregateNames != null) {
- for (int i = 0; i < aggregateNames.length; i++) {
- String aggregateName = aggregateNames[i];
- 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 idList = mmd.getIds();
- if (idList == null) {
- // Invalid <migrate> element.
- continue;
- }
-
- Iterator idIterator = idList.iterator();
- while (idIterator.hasNext()) {
- String[] ids = (String[]) idIterator.next();
- 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?
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.initializeValidator(IConfigurationElement, String, String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_RUN);
- //entry.setTokens(new String[]{validatorName});
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_RUN),
- new String[]{validatorName});
- entry.setText(result);
-
- logger.write(Level.FINE, entry);
- }
- return null;
- }
-
- //WTP Bugzilla defect: 82338
- //Using the Unique Identifier give the flexibility of the same validator class used by other validator extentions 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...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.initializeValidator(IConfigurationElement, String, String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_CLASS);
- entry.setTokens(new String[]{validatorName});
- logger.write(Level.FINE, entry);
- }
- return null;
- }
-
- String helperImplName = getHelperName(element);
- if (helperImplName == null) {
- // Same as before; how can we instantiate when...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.initializeValidator(IConfigurationElement, String, String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_RUN);
- entry.setTokens(new String[]{validatorImplName});
- logger.write(Level.FINE, entry);
- }
- 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.
- //
- ValidatorMetaData vmd = new ValidatorMetaData();
- vmd.addFilters(getFilters(element)); // validator may, or may not, have filters
- vmd.addProjectNatureFilters(getProjectNatureFilters(element)); // validator may, or may not, specify a project nature
- vmd.addFacetFilters(getFacetIds(element));//validator may or may not specify the facet
- vmd.setEnablementElement(getEnablementElement(element));
- vmd.addAggregatedValidatorNames(getAggregateValidatorsNames(element)); // if a validator
- // aggregated another validator, it should identify
- // the sub-validator(s)' class name
- vmd.setValidatorDisplayName(validatorName.intern()); // validator must have a display name.
- vmd.setValidatorUniqueName(validatorImplName.intern());
- vmd.setPluginId(pluginId);
- vmd.setIncremental(getIncremental(element));
- vmd.setFullBuild(getFullBuild(element));
- vmd.setAsync(getAsync(element));
- vmd.setRuleGroup(getRuleGroup(element));
- vmd.setEnabledByDefault(getEnabledByDefault(element));
- vmd.setMigrationMetaData(getMigrationMetaData(element, vmd));
- vmd.setHelperClass(element, helperImplName);
- vmd.setValidatorClass(runChildren[0]); // associate the above attributes with the validator
- vmd.addDependentValidator(getDependentValidatorValue(element));
- vmd.setContentTypeIds(getContentTypeBindings(element));
- initializeValidatorCustomMarkers(element, pluginId, vmd);
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINEST)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.initializeValidator(IConfigurationElement, String, String)"); //$NON-NLS-1$
- entry.setText("validator loaded: " + validatorImplName); //$NON-NLS-1$
- logger.write(Level.FINEST, entry);
- }
-
- return vmd;
- }
-
- /**
- * @param element
- * @param pluginId
- * @param vmd
- */
- private void initializeValidatorCustomMarkers(IConfigurationElement element, String pluginId, ValidatorMetaData vmd) {
- String[] customMarkerIds = getMarkerIdsValue(element);
- if (customMarkerIds != null && customMarkerIds.length > 0) {
- String[] qualifiedMarkerIds = new String[customMarkerIds.length];
- for (int i = 0; i < customMarkerIds.length; i++) {
- String markerid = customMarkerIds[i];
- if (markerid.lastIndexOf(".") != -1) {
- String pluginID = markerid.substring(0, markerid.lastIndexOf("."));
- Bundle bundle = Platform.getBundle(pluginID);
- if (bundle == null)
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i];
- else
- qualifiedMarkerIds[i] = customMarkerIds[i];
- } else
- qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i];
- }
- vmd.setMarkerIds(qualifiedMarkerIds); //$NON-NLS-1$
- }
- }
-
- 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 ce) {
- Logger.getLogger().log(ce);
- }
- 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 getAllValidators() {
- Set validators = new HashSet();
- 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$
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- String[] msgParm = {extension.getUniqueIdentifier()};
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.readExtension(IExtension)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_VALIDATORNAME_IS_NULL);
- //entry.setTokens(msgParm);
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_VALIDATORNAME_IS_NULL),
- msgParm);
- entry.setText(result);
- logger.write(Level.FINE, entry);
- }
- } 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.getNamespace();
- 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 = (ValidatorMetaData) _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 15fd626..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-public class ValidationSelectionHandlerRegistryReader extends RegistryReader {
-
- 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 validationSelectionHandlers;
-
- public ValidationSelectionHandlerRegistryReader() {
- super(ValidationPlugin.PLUGIN_ID, VALIDATION_SELECTION_HANDLER);
- }
-
- public static ValidationSelectionHandlerRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationSelectionHandlerRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
-
-
- /* (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 getValidationSelectionHandlers() {
- if (validationSelectionHandlers == null)
- validationSelectionHandlers = new ArrayList();
- return validationSelectionHandlers;
- }
-
- public Object getExtendedType(Object selection) {
- Object result = null;
- for (int i=0; i<getValidationSelectionHandlers().size(); i++ ) {
- IValidationSelectionHandler handler = (IValidationSelectionHandler) getValidationSelectionHandlers().get(i);
- 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 f7ae9c2..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);
- }
-
-
- /**
- * 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 bbd636c..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
+++ /dev/null
@@ -1,658 +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.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 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.jem.util.logger.proxy.Logger;
-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.plugin.ValidationPlugin;
-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 ValidatorFilter[] _filters;
- private ValidatorNameFilter[] _projectNatureFilters;
- private String[] facetFilters;
- private IValidator _validator;
- private IWorkbenchContext _helper;
- private String _validatorDisplayName;
- private String _validatorUniqueName;
- private String[] _aggregatedValidators;
- private String[] contentTypeIds = null;
- private String[] _validatorNames;
- private String _pluginId;
- private boolean _supportsIncremental = RegistryConstants.ATT_INCREMENTAL_DEFAULT;
- private boolean _supportsFullBuild = RegistryConstants.ATT_FULLBUILD_DEFAULT;
- private Logger _logger;
- private boolean _isEnabledByDefault = RegistryConstants.ATT_ENABLED_DEFAULT;
- private MigrationMetaData _migrationMetaData;
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- private boolean _async = RegistryConstants.ATT_ASYNC_DEFAULT;
- private boolean dependentValidator = RegistryConstants.DEP_VAL_VALUE_DEFAULT;
- private String[] markerIds;
- private String _helperClassName;
- private IConfigurationElement _helperClassElement;
- private IConfigurationElement _validatorClassElement;
- private boolean _cannotLoad = false;
- private boolean manualValidation = true;
- private boolean buildValidation = true;
- private Map helpers = Collections.synchronizedMap( new HashMap() );
- private Expression enablementExpression;
-
- ValidatorMetaData() {
- //default
- }
-
- /**
- * Add to 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.
- */
- void addAggregatedValidatorNames(String[] val) {
- _aggregatedValidators = val;
- }
-
- /**
- * Add the name/type filter pair(s).
- */
- void addFilters(ValidatorFilter[] filters) {
- _filters = filters;
- }
-
- /**
- * Add the project nature filter(s).
- */
- void addProjectNatureFilters(ValidatorNameFilter[] filters) {
- _projectNatureFilters = filters;
- }
-
- /**
- * Add the facet filter(s).
- */
- protected void addFacetFilters(String[] filters) {
- facetFilters = filters;
- }
-
- protected String[] getFacetFilters() {
- return facetFilters;
- }
-
- public List getNameFilters() {
- List nameFilters = new ArrayList();
- if (_filters != null && _filters.length > 0) {
- for (int i = 0; i < _filters.length; i++) {
- ValidatorFilter filter = _filters[i];
- 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() {
- if (_validatorNames == null) {
- int aLength = (_aggregatedValidators == null) ? 0 : _aggregatedValidators.length;
- _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 {
- if (_helper == null) {
- _helper = ValidationRegistryReader.createHelper(_helperClassElement, _helperClassName);
- if (_helper == null) {
- _helper = new WorkbenchContext();
- //setCannotLoad();
- //throw new InstantiationException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_DISABLEH, new String[]{_helperClassName, getValidatorUniqueName()}));
- }
- // Won't be using the element & name again, so clear them.
- //_helperClassElement = null;
- //_helperClassName = null;
- }
- if ((_helper.getProject() == null) || !(_helper.getProject().equals(project))) {
- // Initialize helper with the new project
- _helper.setProject(project);
- }
- return _helper;
- }
-
- /**
- * cannotLoad is false if both the IValidator and IWorkbenchContext instance can be instantiated.
- * This method should be called only by the validation framework, and only if an
- * InstantiationException was thrown.
- *
- * @param can
- */
- private void setCannotLoad() {
- _cannotLoad = true;
- }
-
- /**
- * Return false if both the IValidator and IWorkbenchContext instance can be instantiated.
- *
- * @return boolean
- */
- public boolean cannotLoad() {
- return _cannotLoad;
- }
-
- /**
- * This method must not be called until the unique id of the validator has been initialized.
- */
- public Logger getMsgLogger() {
- if (_logger == null) {
- _logger = ValidationPlugin.getPlugin().getMsgLogger();
- /*
- * // Decided against having a logger for each validator because each validator // would
- * need to contribute an extension in their plugins for it to be recognized // by the
- * logging preference page. For now, just use the validation framework's logger. _logger =
- * (MsgLogger)MsgLogger.getFactory().getLogger(getValidatorUniqueName());
- * _logger.write(Level.CONFIG, getValidatorDisplayName());
- */
- }
- return _logger;
- }
-
- 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.
- *
- * @return IValidator
- * @throws InstantiationException
- */
- public IValidator getValidator() throws InstantiationException {
- if (_validator == null) {
- _validator = ValidationRegistryReader.createValidator(_validatorClassElement, getValidatorUniqueName());
-
- // Since the element won't be used any more, clear it.
- //_validatorClassElement = null;
-
- if (_validator == null) {
- setCannotLoad();
- throw new InstantiationException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_DISABLEV, new String[]{getValidatorUniqueName()}));
- }
- }
- return _validator;
- }
-
- 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
- if (_filters == 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.)
- if (checkIfValidSourceFile(resource)) {
- for (int i = 0; i < filters.length; i++) {
- ValidatorFilter filter = filters[i];
- 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);
- 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;
- }
-
- void setHelperClass(IConfigurationElement element, String helperClassName) {
- _helperClassElement = element;
- _helperClassName = helperClassName;
- }
-
- void setEnabledByDefault(boolean enabledByDefault) {
- _isEnabledByDefault = enabledByDefault;
- }
-
- void setIncremental(boolean isIncremental) {
- _supportsIncremental = isIncremental;
- }
-
- void setFullBuild(boolean fullBuild) {
- _supportsFullBuild = fullBuild;
- }
-
- void setAsync(boolean isAsync) {
- _async = isAsync;
- }
-
- void setMigrationMetaData(MigrationMetaData mmd) {
- _migrationMetaData = mmd;
- }
-
- void setRuleGroup(int ruleGroup) {
- _ruleGroup = ruleGroup;
- }
-
- void setValidatorClass(IConfigurationElement element) {
- _validatorClassElement = element;
- // validator class name == validatorUniqueName
- }
-
- void setValidatorDisplayName(String validatorName) {
- _validatorDisplayName = validatorName;
- }
-
- void setValidatorUniqueName(String validatorUniqueName) {
- _validatorUniqueName = validatorUniqueName;
- }
-
- void setPluginId(String validatorPluginId) {
- _pluginId = validatorPluginId;
- }
-
- public String toString() {
- return getValidatorUniqueName();
- }
-
- public class MigrationMetaData {
- private Set _ids = null;
-
- public MigrationMetaData() {
- //default
- }
-
- public void addId(String oldId, String newId) {
- if (oldId == null) {
- // log
- return;
- }
-
- if (newId == null) {
- // log
- return;
- }
-
- String[] ids = new String[]{oldId, newId};
- getIds().add(ids);
- }
-
- public Set getIds() {
- if (_ids == null) {
- _ids = new HashSet();
- }
- return _ids;
- }
- }
-
- /**
- * @param b
- */
- public void addDependentValidator(boolean b) {
- dependentValidator = b;
- }
-
- /**
- * @param b
- */
- public boolean isDependentValidator() {
- return dependentValidator;
- }
-
- /**
- * @return Returns the markerId.
- */
- public String[] getMarkerIds() {
- return markerIds;
- }
-
- /**
- * @param markerId
- * The markerId to set.
- */
- public void setMarkerIds(String[] markerId) {
- this.markerIds = markerId;
- }
-
- public boolean isBuildValidation() {
- return buildValidation;
- }
-
- public void setBuildValidation(boolean buildValidation) {
- this.buildValidation = buildValidation;
- }
-
- public boolean isManualValidation() {
- return manualValidation;
- }
-
- public void setManualValidation(boolean manualValidation) {
- this.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 (IWorkbenchContext)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 void setEnablementElement(Expression enablementElement) {
- enablementExpression = enablementElement;
- }
-
-public String[] getContentTypeIds() {
- return contentTypeIds;
-}
-
-public void setContentTypeIds(String[] contentTypeIds) {
- this.contentTypeIds = 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 5b2988a..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("*.");
-
- //return value if the fileter name extension matches the extension
- //of the resource
- if (indexOfStarDot != -1) {
- String nameExtension = name.substring(name.lastIndexOf(".") + 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 12161d4..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
+++ /dev/null
@@ -1,157 +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.text.MessageFormat;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * 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 = null;
- private String _mustImplementClass = null; // 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;
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorTypeFilter.setTypeFilter(String)"); //$NON-NLS-1$
- entry.setMessageTypeID(ResourceConstants.VBF_EXC_INVALID_TYPE_FILTER);
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_TYPE_FILTER), new String[]{filter, getMustImplementClass()});
- entry.setText(result);
- //entry.setTokens(new String[]{filter, getMustImplementClass()});
- logger.write(Level.FINE, entry);
- }
- }
- }
- } catch (ClassNotFoundException exc) {
- _typeFilterClass = null;
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorTypeFilter.setTypeFilter(String)"); //$NON-NLS-1$
- entry.setText("The class named " + filter + " cannot be instantiated because it does not exist. Check the spelling of the name, in the validator's plugin.xml contribution, and try restarting eclipse again."); //$NON-NLS-1$ //$NON-NLS-2$
- logger.write(Level.FINE, entry);
- }
- 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 5175df1..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-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 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
- {
- // Apparently this method will not be called on an IValidatorJob.
- }
-
- /**
- * 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;
- }
-}
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 d8ba0be..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
+++ /dev/null
@@ -1,126 +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.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-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.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.IValidator;
-
-/**
- * ValidatorDelegateDescriptor stores information about a delegate validator.
- *
- * It is also used to store the instance of the validator it describes. To
- * obtain the instance call getValidator().
- */
-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 uniques 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)
- {
- this.id = id;
- this.delegateConfiguration = delegateConfiguration;
- this.name = delegateName;
- this.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)
- {
- String delegatingValidatorName = ValidationRegistryReader.getReader().getValidatorMetaData(getTargetID()).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 5169850..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
+++ /dev/null
@@ -1,200 +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 java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.validation.internal.core.ValidationException;
-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)
- {
- instance = new ValidatorDelegatesRegistry();
-
- ValidatorDelegatesRegistryReader reader = new ValidatorDelegatesRegistryReader(instance);
- reader.readRegistry();
- }
-
- return instance;
- }
-
- /**
- * The map of target validator id to Map of delegates by id.
- */
- private Map delegatesByTarget = new HashMap();
-
- /**
- * 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 delegates = (Map) delegatesByTarget.get(targetID);
-
- if (delegates == null)
- {
- delegates = new HashMap();
- 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 delegates = getDelegateDescriptors(targetID);
-
- if (delegates == null)
- {
- return null;
- }
-
- // 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 delegatesIterator = delegates.values().iterator();
-
- if (!delegatesIterator.hasNext())
- {
- return null;
- }
-
- ValidatorDelegateDescriptor descriptor = (ValidatorDelegateDescriptor) delegatesIterator.next();
-
- return descriptor.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 getDelegateDescriptors(String targetID)
- {
- return (Map) 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 delegates = (Map) delegatesByTarget.get(targetID);
-
- if (delegates == null)
- {
- // No delegates registered for this target.
-
- return null;
- }
-
- if (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 delegatesByID = (Map) 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 264e26e..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.delegates;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * This class reads the plugin 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 (int index = 0; index < elements.length; index++)
- {
- readElement(elements[index]);
- }
- }
- }
-}
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 2c2da31..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
+++ /dev/null
@@ -1,72 +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 java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EventManager::closing(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
- }
- }
- }
-
-}
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 aaf26de..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
+++ /dev/null
@@ -1,236 +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 java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EnabledIncrementalVAlidatorsOperation(IProject<" + project.getName() + ">, IResourceDelta, int, boolean)"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EnabledIncrementalVAlidatorsOperation(IProject<" + project.getName() + ">, IResourceDelta, int, boolean)"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
- }
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EnabledIncrementalValidatorsOperation(IResource[], IProject<" + project.getName() + ">, boolean)"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- //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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("EnabledIncrementalValidatorsOperation(IResource[], IProject<" + project.getName() + ">, boolean)"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, exc);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- //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 c707bcb..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
+++ /dev/null
@@ -1,165 +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;
-
-
-/**
- * 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 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 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 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 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/IResourceUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
deleted file mode 100644
index d0a34bf..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
+++ /dev/null
@@ -1,22 +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;
-
-
-/**
- * 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
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 3724282..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
+++ /dev/null
@@ -1,173 +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.
- *
- * 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.
- *
- * 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".
- *
- * 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.
- */
- 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 4f22ced..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
+++ /dev/null
@@ -1,39 +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.
- *
- * 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 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 c019fcf..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.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;
- }
-
-}
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 c11ec1d..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
+++ /dev/null
@@ -1,124 +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 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
- * org.eclipse.core.resources.IProject
- * @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.
- * @param ruleGroup
- * Whether a FULL or FAST pass should be invoked.
- *
- * 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, int ruleGroup, boolean async) throws IllegalArgumentException {
- super(project, force, ruleGroup, async);
-
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
- if (vmd == null) {
- // No validator, with that plugin 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 plugin 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 enabled = new HashSet();
- enabled.add(vmd);
- setEnabledValidators(enabled);
- }
-}
\ No newline at end of file
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 ab5f941..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
+++ /dev/null
@@ -1,33 +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
- *******************************************************************************/
-/*
- * 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;
-
-/**
- * @author vijayb
- */
-public interface ReferencialFileValidator {
-
- /**
- * Answer the referenced files.
- *
- * @param inputFiles
- * @return a list of IFile's.
- */
- public List 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 6406ffa..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.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
- *******************************************************************************/
-/*
- * 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() {
- super();
- }
-
- /**
- * Return a list of all files contained in project to infinite depth
- */
- public static List getAllProjectFiles(IProject project) {
- List result = new ArrayList();
- if (project == null)
- return result;
- try {
- result = collectFiles(project.members(), result);
- } catch (CoreException e) {
- //Ignore
- }
- 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;
- }
-}
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 8663962..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
+++ /dev/null
@@ -1,288 +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.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.OperationCanceledException;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.TimeEntry;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * Validation Framework Builder.
- *
- * This builder is configured on J2EE IProjects automatically, can be added to other types of
- * projects through the Properties page, and launches validation on the project if the project has
- * build validation enabled.
- */
-public class ValidationBuilder extends IncrementalProjectBuilder {
- public static final int NO_DELTA_CHANGE = -1;
- protected List referencedProjects;
- protected IWorkbenchContext workbenchContext = null;
-
- public ValidationBuilder() {
- super();
- }
-
- private IProject[] getAllReferencedProjects(IProject project, Set visitedProjects) {
- if (visitedProjects == null)
- visitedProjects = new HashSet();
- else if (visitedProjects.contains(project))
- return getReferencedProjects();
- else
- visitedProjects.add(project);
- if (referencedProjects == null)
- referencedProjects = new ArrayList();
- try {
- if (project.isAccessible()) {
- IProject[] refProjArray = project.getReferencedProjects();
- collectReferecedProject(refProjArray);
- for (int i = 0; i < refProjArray.length; i++) {
- IProject refProject = refProjArray[i];
- getAllReferencedProjects(refProject, visitedProjects);
- }
- }
- return getReferencedProjects();
- } catch (CoreException core) {
- return null;
- }
- }
-
- public IWorkbenchContext getWorkbenchContext() {
- if(workbenchContext == null) {
- workbenchContext = new WorkbenchContext();
- workbenchContext.setProject(getProject());
- }
- return workbenchContext;
- }
-
-
- /**
- * @param referencedProjects2
- * @param refProjArray
- */
- private void collectReferecedProject(IProject[] refProjArray) {
- for (int i = 0; i < refProjArray.length; i++) {
- IProject project = refProjArray[i];
- if (!referencedProjects.contains(project))
- referencedProjects.add(project);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#clean(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected void clean(IProgressMonitor monitor) throws CoreException {
- IProject currentProject = getProject();
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.updateTaskList(" + currentProject.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);
- }
- }
- }
-
- }
-
- private IProject[] getReferencedProjects() {
- IProject[] refProjArray = new IProject[referencedProjects.size()];
- for (int i = 0; i < referencedProjects.size(); i++) {
- refProjArray[i] = (IProject) referencedProjects.get(i);
- }
- return refProjArray;
- }
-
- public IProject[] build(int kind, Map parameters, IProgressMonitor monitor) {
- long start = System.currentTimeMillis();
- int executionMap = 0x0;
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- IResourceDelta delta = null;
- IProject project = getProject();
- IProject[] referenced = getAllReferencedProjects(project, null);
- try {
- if (ValidatorManager.getManager().isSuspended(project)) {
- // Do not perform validation on this project
- executionMap |= 0x1;
- return referenced;
- }
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- delta = getDelta(project);
- boolean doFullBuild = (kind == FULL_BUILD);
-// boolean doAutoBuild = ((delta != null) && (kind == AUTO_BUILD));
-// boolean doIncrementalBuild = ((delta != null) && (kind == INCREMENTAL_BUILD));
-// if ((doFullBuild || doIncrementalBuild) && !prjp.isBuildValidate()) {
-// // Is a build validation about to be invoked? If so, does the
-// // user want build validation to run?
-// executionMap |= 0x2;
-// return referenced;
-// }
- // 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.
- executionMap |= 0x4;
- }
- return referenced;
- }
- if (doFullBuild) {
- performFullBuild(monitor, prjp);
- } else {
-// if (doAutoBuild && !prjp.isAutoValidate()) {
-// executionMap |= 0x8;
-// return referenced;
-// }
- if (delta.getAffectedChildren().length == 0) {
- if (isReferencedProjectInDelta(referenced))
- performFullBuildForReferencedProjectChanged(monitor, prjp);
- else
- executionMap |= 0x10;
- return referenced;
- }
- EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, true);
- operation.run(monitor);
- }
- return referenced;
- } catch (InvocationTargetException exc) {
- logInvocationTargetException(logger, exc);
- executionMap |= 0x20;
- return referenced;
- } catch (Exception exc) {
- logBuildError(logger, exc);
- executionMap |= 0x40;
- return referenced;
- } finally {
- referencedProjects = null;
- // The builder's time needs to be FINE because the builder is
- // called often.
- if (logger.isLoggingLevel(Level.FINE)) {
- logBuilderTimeEntry(start, executionMap, logger, delta);
- }
- }
- }
-
- 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 enabledValidatorsSet = InternalValidatorManager.wrapInSet(enabledValidators);
- EnabledValidatorsOperation op = new EnabledValidatorsOperation(getProject(), enabledValidatorsSet, true);
- op.run(monitor);
- }
- }
-
- private void logInvocationTargetException(Logger logger, InvocationTargetException exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationBuilder::build"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- private void logBuildError(Logger logger, Throwable exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- if( ! (exc instanceof OperationCanceledException) ){
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationBuilder.build(int, Map, IProgressMonitor)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- private void logBuilderTimeEntry(long start, int executionMap, Logger logger, IResourceDelta delta) {
- TimeEntry entry = ValidationPlugin.getTimeEntry();
- entry.setSourceID("ValidationBuilder.build(int, Map, IProgressMonitor)"); //$NON-NLS-1$
- entry.setProjectName(getProject().getName()); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setExecutionMap(executionMap);
- entry.setElapsedTime(System.currentTimeMillis() - start);
- if (delta == null) {
- entry.setDetails("delta == null"); //$NON-NLS-1$
- }
- entry.setToolName("ValidationBuilder"); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
-}
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 cd8a1d8..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
+++ /dev/null
@@ -1,1785 +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.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-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.TimeEntry;
-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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-/**
- * Implemented Validators methods 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.
- *
- * This operation is not intended to be subclassed outside of the validation framework.
- */
-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$
-
- protected static final boolean DEFAULT_ASYNC = true; // For the deprecated
- // constructors, by
- // default the
- // operation will not
- // fork.
- protected static final boolean DEFAULT_FORCE = true;
- protected static final String VALIDATIONLAUNCHERMSG = "Waiting for build";
-
- class ValidationLauncherJob extends Job {
- private Job validationJob;
- public ValidationLauncherJob(Job validationJob) {
- super(ResourceHandler.getExternalizedMessage("VBF_VALIDATION_JOB_MSG"));
-
- setSystem(true);
- setRule(ResourcesPlugin.getWorkspace().getRoot());
- this.validationJob= validationJob;
- }
- protected IStatus run(IProgressMonitor monitor) {
- validationJob.schedule();
- return Status.OK_STATUS;
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use DEFAULT_ASYNC
- */
- protected static final boolean DEFAULT_FORK = false; // @deprecated
- private IProject _project = null; // project to be validated
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT; // which
- // pass
- // should
- // the
- // validation
- // invoke
- private boolean _fork = DEFAULT_ASYNC; // do not fork the validation into a
- // different thread by default
- private Map _fileDeltas = null; // To reduce object creation,
- private IResourceDelta _delta = null;
- // 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 _enabledValidators = null;
- private boolean _force = DEFAULT_FORCE; // force this operation to run even
- // if it doesn't need to?
- private boolean _isFullValidate = false; // Run a full validation or an
- // incremental? (true = full)
- private Boolean _isAutoBuild = null; // Is the global auto-build preference
- // enabled?
- private Set _launchedValidators = null; // A list of the validators that
-
- 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 String[]{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();
- }
-
- /**
- * 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();
- context = aContext;
- }
-
- /**
- * @deprecated Will be removed in Milestone 3.
- */
- protected void terminateCleanup(WorkbenchReporter reporter) {
- Set enabledValidators = getEnabledValidators();
- Iterator iterator = enabledValidators.iterator();
- ValidatorMetaData vmd = null;
-
- while (iterator.hasNext()) {
- vmd = (ValidatorMetaData) iterator.next();
- reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
- try {
- reporter.removeAllMessages(vmd.getValidator());
- } catch (InstantiationException exc) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
- // Log the reason for the disabled validator
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation::terminateCleanup"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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:
- // 1. auto-validation has run and the validator is incremental,
- // 2. There are no files for the validator to validate.
- // There are files to validate if this is a full validation or if the
- // validator filtered in some of the deltas.
- boolean autoValidateRan = false;
- if (_isAutoBuild != null) {
- // User set the autoBuild default, so check if validation is
- // necessary or not.
- autoValidateRan = ValidatorManager.getManager().isAutoValidate(getProject(), _isAutoBuild.booleanValue()) && vmd.isIncremental();
- }
- boolean hasFiles = (isFullValidate() || (delta.length > 0));
- return (!autoValidateRan && hasFiles);
- }
-
- /**
- * 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 enabledValidators = getEnabledValidators();
- if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
- return false;
- }
- if (isFullValidate()) {
- return true;
- }
- Iterator iterator = enabledValidators.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- if (isValidationNecessary(vmd, getFileDeltas(monitor, vmd))) {
- return true;
- }
- }
- return false;
- }
-
- private Map getFileDeltas(IProgressMonitor monitor) throws CoreException {
- if (_fileDeltas == null) {
- loadFileDeltas(monitor);
- }
- return _fileDeltas;
- }
-
- private IFileDelta[] getFileDeltas(IProgressMonitor monitor, ValidatorMetaData vmd) throws CoreException {
- Set result = (Set) 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 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 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 getLaunchedValidators() {
- if (_launchedValidators == null) {
- _launchedValidators = new HashSet();
- }
- return _launchedValidators;
- }
-
- protected void setEnabledValidators(Set 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();
- Iterator iterator = evmds.iterator();
- while (iterator.hasNext()) {
- ValidatorMetaData vmd = (ValidatorMetaData) iterator.next();
- 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 {
- long start = System.currentTimeMillis();
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- try {
- // In order to check whether or not the monitor has been cancelled,
- // the monitor must not be null.
- if (progressMonitor == null) {
- return;
- }
- if (ValidatorManager.getManager().isSuspended(getProject())) {
- return;
- }
- if (!areValidatorsEnabled()) {
- // save some processing time...
- return;
- }
-
- final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor);
-
- try {
- // Periodically check if the user has cancelled the operation
- checkCanceled(reporter);
- preValidate(reporter);
- validate(reporter);
- validateReferencialFiles(reporter);
- } catch (CoreException exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation.run"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- } finally {
- 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);
- }
- }
- }
- }
-
- /**
- * @param reporter
- * @param referencialFileValidator
- */
- private void refFileValidateFileDelta(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- IResourceDelta[] resourceDelta = _delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
- List inputFiles = new ArrayList();
-
- // A list of IFile's
- List referencingFiles = new ArrayList();
- 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 rFilesToValidate = refFileValidator.getReferencedFile(inputFiles);
- if (rFilesToValidate != null && !rFilesToValidate.isEmpty())
- referencingFiles.addAll(rFilesToValidate);
- try {
- if (!referencingFiles.isEmpty())
- validateReferencingFiles(reporter, referencingFiles);
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- }
- }
-
- /**
- * @param delta
- * @return
- */
- private void getFileResourceDeltaInFolder(IResourceDelta delta, List 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);
- }
- }
-
- /**
- * @param reporter
- * @param referencialFileValidator
- */
- private void postValidateProject(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
- Set set = ValidationRegistryReader.getReader().getValidatorMetaData(_project);
- Iterator it = set.iterator();
- while (it.hasNext()) {
- ValidatorMetaData data = (ValidatorMetaData) it.next();
- List filters = data.getNameFilters();
- List files = getAllFilesForFilter(filters);
- if (!files.isEmpty()) {
- List fileForValidation = refFileValidator.getReferencedFile(files);
- try {
- validateReferencingFiles(reporter, fileForValidation);
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- }
- }
- }
-
- /**
- * @param filters
- * @return
- */
- private List getAllFilesForFilter(List filters) {
- if (!filters.isEmpty()) {
- List allProjectFiles = ReferencialFileValidatorHelper.getAllProjectFiles(_project);
- List filterFiles = new ArrayList();
- for (int i = 0; i < filters.size(); i++) {
- String fileName = (String) filters.get(i);
- if (fileName == null)
- continue;
- for (int j = 0; j < allProjectFiles.size(); j++) {
- IFile projectFile = (IFile) allProjectFiles.get(j);
- 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 Collections.EMPTY_LIST;
- }
-
- private void validateReferencingFiles(IReporter reporter, List referencingFiles) throws Exception {
- HashSet validatedFiles = new HashSet();
- for (int i = 0; i < referencingFiles.size(); i++) {
- IFile refFile = (IFile) referencingFiles.get(i);
- 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 set = ValidationRegistryReader.getReader().getValidatorMetaData(project);
-// IFileDelta[] changedfiles = new FileDelta[]{new WorkbenchFileDelta(refFile.getProjectRelativePath().toString(), IFileDelta.CHANGED, refFile)};
- Iterator it = set.iterator();
- while (it.hasNext()) {
- ValidatorMetaData data = (ValidatorMetaData) it.next();
- 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;
- ValidatorMetaData vmd = null;
- Iterator iterator = null;
-// WorkbenchReporter nullReporter = new WorkbenchReporter(getProject(), new NullProgressMonitor());
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- IFileDelta[] delta = null;
-
- HashSet jobValidators = new HashSet();
- HashSet validators = new HashSet();
-
-
- iterator = getEnabledValidators().iterator();
-
- while( iterator.hasNext() ){
- vmd = (ValidatorMetaData) iterator.next();
- 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 );
- }
-
-
- try {
- //iterator = getEnabledValidators().iterator();
- iterator = validators.iterator();
-
- // In order to allow validators to run, must first check if there's
- // space for new markers.
- // But we don't want the old markers to prevent validation from
- // running again, so delete all
- // of the old markers first, and then run validation.
- while (iterator.hasNext()) {
- vmd = (ValidatorMetaData) iterator.next();
- // 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 plugin
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (logger.isLoggingLevel(Level.FINEST)) {
- TimeEntry entry = ValidationPlugin.getTimeEntry();
- entry.setSourceID("ValidationOperation.validate(WorkbenchReporter)"); //$NON-NLS-1$
- entry.setProjectName(getProject().getName());
- entry.setToolName(vmd.getValidatorUniqueName());
- entry.setElapsedTime(0);
- StringBuffer buffer = new StringBuffer();
- buffer.append("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$
- boolean autoBuild = (_isAutoBuild == null) ? ValidatorManager.getManager().isGlobalAutoBuildEnabled() : _isAutoBuild.booleanValue();
- buffer.append(ValidatorManager.getManager().isAutoValidate(getProject(), autoBuild));
- 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));
- }
- }
- entry.setDetails(buffer.toString());
- logger.write(Level.FINEST, entry);
- }
- if (!willRun) {
- continue;
- }
- } catch (CoreException exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation.validate(WorkbenchReporter)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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);
- */
- continue;
- }
- try {
- context = vmd.getHelper(getProject());
- initValidateContext(delta);
- validator = vmd.getValidator();
-
- checkCanceled(reporter);
-
- } catch (InstantiationException exc) {
- // 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::validate(WorkbenchReporter)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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, vmd, iterator, logger, exc);
- } finally {
- releaseCachedMaps();
- }
- }
-
- private void releaseCachedMaps() {
- if (ValidationRegistryReader.getReader().projectValidationMetaData != null) {
- ValidationRegistryReader.getReader().projectValidationMetaData.clear();
- ValidationRegistryReader.getReader().projectValidationMetaData = null;
- }
- IProjectValidationHelper helper = ValidationHelperRegistryReader.getInstance().getValidationHelper();
- if (helper != null)
- helper.disposeInstance();
- }
-
- private void initValidateContext(IFileDelta[] delta) {
- if (context instanceof WorkbenchContext) {
- ((WorkbenchContext)context).setValidationFileURIs(new ArrayList());
- for(int i = 0; i < delta.length; i++) {
- IFileDelta file = delta[i];
- 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 iterator, final Logger logger, 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);
- // Log the reason for the disabled validator
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation::validate(WorkbenchReporter)"); //$NON-NLS-1$
- entry.setTargetException(exc2);
- logger.write(Level.SEVERE, entry);
- }
- 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 "cancelled"
- // message in the dialog
-
- }
-
- /* package */
- void internalValidate(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd,final IWorkbenchContext aContext, final IFileDelta[] delta) throws OperationCanceledException {
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- 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 exc) {
- // If there is a problem with this particular validator, log the
- // error and continue
- // with the next validator.
- // 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.internalValidate"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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);
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- 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
- // all
- // messages
- // from
- // this
- // resource
- } 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 exc) {
- // If there is a problem with this particular validator, log the
- // error and continue
- // with the next validator.
- // 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.validate(WorkbenchMonitor)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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);
- */
- 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.
- *
- * 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.)
- */
- private final void launchValidator(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
- if (reporter == null) {
- return;
- }
- checkCanceled(reporter);
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- // 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());
- }
- long start = System.currentTimeMillis();
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_STARTING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
- reporter.displaySubtask(message);
- if (logger.isLoggingLevel(Level.FINEST)) {
- // This internal "launched validators" value is used only in
- // tests.
- getLaunchedValidators().add(vmd);
- }
- //initValidateContext(delta);
- ValidatorLauncher.getLauncher().start(helper, validator, reporter);
- long finish = System.currentTimeMillis();
- 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 (MessageLimitException exc) {
- throw exc;
- } 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 MessageLimitException) {
- MessageLimitException mssgExc = (MessageLimitException) exc.getAssociatedException();
- throw mssgExc;
- } else 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,
- // set
- // the
- // class
- // loader,
- // so
- // that
- // the
- // exception's
- // getMessage()
- // method
- // can
- // retrieve
- // the
- // resource
- // bundle
- 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) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception exc) {
- // If there is a problem with this particular validator, log the
- // error and continue
- // with the next validator.
- // 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.validate(WorkbenchMonitor)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 (MessageLimitException e) {
- throw e;
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception 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);
- }
-
- /*
- 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);
- try {
- reporter.addMessage(validator, message);
- } catch (MessageLimitException e) {
- throw e;
- }
-
- */
- return;
- }
- try {
- helper.cleanup(reporter);
- } catch (MessageLimitException e) {
- throw e;
- } catch (OperationCanceledException e) {
- throw e;
- } catch (Exception 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);
- }
-
- /*
- The code below 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);
- try {
- reporter.addMessage(validator, message);
- } catch (MessageLimitException e) {
- throw 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)); // One
- // unit
- // of
- // work
- // = 1
- // (i.e.,
- // 1
- // resource)
- }
- }
-
-// 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"); }
- */
- public class ProjectRunnable implements Runnable {
- private WorkbenchReporter _reporter = null;
- private IValidator _validator = null;
- private ValidatorMetaData _vmd = null;
-// private IValidationContext _helper = null;
- private IFileDelta[] __delta = null;
-
- public ProjectRunnable(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta, Iterator iterator) {
- _reporter = reporter;
- _validator = validator;
- _vmd = vmd;
-// _helper = helper;
- __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(HashSet validators, final WorkbenchReporter reporter) throws OperationCanceledException{
-
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- Iterator iterator = validators.iterator();
- ValidatorMetaData vmd = null;
- IValidator validator = null;
- IFileDelta[] delta = null;
- IWorkbenchContext workbenchcontext = null;
-
- while (iterator.hasNext()) {
- checkCanceled(reporter);
-
- vmd = (ValidatorMetaData) iterator.next();
-
- try {
- delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
- boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
- if (!willRun) {
- continue;
- }
- } catch (CoreException exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation.launchJobs()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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);
- */
-
- continue;
- }
-
- try {
- validator = vmd.createValidator();
- workbenchcontext = vmd.createHelper( getProject() );
- initValidateContext( delta, workbenchcontext );
- vmd.addHelper((IValidatorJob)validator, workbenchcontext);
- checkCanceled(reporter);
-
- } catch (InstantiationException exc) {
- // 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.launchJobs()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 (Throwable exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationOperation.launchJobs()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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.
- reporter.getProgressMonitor().done();
- }
- }
-
-
-
-
-
- }
-
-
-
-
- private void initValidateContext(IFileDelta[] delta, IWorkbenchContext context ) {
- if (context instanceof WorkbenchContext) {
- ((WorkbenchContext)context).setValidationFileURIs(new ArrayList());
- for(int i = 0; i < delta.length; i++) {
- IFileDelta file = delta[i];
- 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);
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-
- if (helper instanceof WorkbenchContext) {
- ((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
- }
- if (logger.isLoggingLevel(Level.FINEST)) {
- // 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 ArrayList list = mgr.getMessages(validator);
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
- };
- try {
-
- ResourcesPlugin.getWorkspace().run(runnable, null, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- mgr.clearMessages( validator );
- validator = null;
- }
- }
- );
- validatorjob.setPriority(Job.DECORATE);
-
- ValidationLauncherJob validationLauncherJob = new ValidationLauncherJob(validatorjob);
- validationLauncherJob.schedule();
-
- //validatorjob.schedule();
-
- }
-
-}
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 8623b24..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
+++ /dev/null
@@ -1,121 +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 java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 tempSet = new HashSet();
- 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(owner);
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationUtility.listValidatorClasses(" + resource.getName() + ", " + severity); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationUtility::isEnabled(" + project.getName() + ", String[])"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- 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 71a98b0..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
+++ /dev/null
@@ -1,199 +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.operations;
-
-import java.util.logging.Level;
-
-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.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-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) {
-
- 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);
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-
- 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);
-
- //to remove, if error is returned from the validator, the job stays back in the UI...
- //should we even return error status if error is found in the validator
- //status = IValidatorJob.OK_STATUS;
-
-
-
- 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());
-
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorJob.run()"); //$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[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
-
- monitor.subTask(message);
- if (exc.getAssociatedMessage() != null) {
- reporter.addMessage(validator, exc.getAssociatedMessage());
- }
- } catch (Exception exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorJob.run()"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- IStatus stat = new Status(IStatus.ERROR,
- ValidationPlugin.PLUGIN_ID, 0, "", exc );
- logger.write(Level.SEVERE, stat);
-
- }
- 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) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorJob.run()"); //$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);
- status = WTPCommonPlugin.createErrorStatus(message.getText());
- return status;
- } finally {
- try {
- helper.cleanup(reporter);
- vmd.removeHelper( validator );
- }catch (OperationCanceledException e) {
- throw e;
- } catch (Exception exc) {
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorJob.run()"); //$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);
- 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();
- }
- 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 5b43d33..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
+++ /dev/null
@@ -1,1243 +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.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 java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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 centralised 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;
- private static final Set EMPTY_SET = Collections.EMPTY_SET; // an empty set, provided for
- // convenience, so that we only
- // construct one empty set once.
- private Set _suspendedProjects;
- private boolean _suspendAllValidation = false;
- private static Class _messageLimitOwner;
- private String[] _internalOwners;
- private Map validatorMsgs = Collections.synchronizedMap( new HashMap() );
- private Set problemValidators = new HashSet();
-
- private ValidatorManager() {
- super();
- _suspendedProjects = new HashSet();
- _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) {
- // TODO Auto-generated catch block
- 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) {
- // TODO Auto-generated catch block
- 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) {
- // TODO Auto-generated catch block
- 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) {
- // TODO Auto-generated catch block
- 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 bulid validation.
- */
- public static void addProjectBuildValidationSupport(IProject project) {
- if (project == null) {
- return;
- }
-
- boolean isBuilderAdded = false;
- 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) {
- 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)) {
- 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.
- *
- * 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorManager::enableAllValidators(" + 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);
- }
- }
- }
- }
-
- /**
- * @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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorManager::getProjectConfiguredIncrementalValidators(" + 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorManager::getProjectConfiguredValidatorMetaData(" + 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getProjectEnabledIncrementalValidators" + 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getProjectEnabledNonIncrementalValidators" + 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);
- }
- }
- 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 getIncrementalValidators(Collection vmds) {
- if (vmds == null) {
- return Collections.EMPTY_SET;
- }
-
- Set result = new HashSet();
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getEnabledIncrementalValidators" + 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);
- }
- }
- 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 getProjectConfiguredValidators(IProject project, Object[] enabledVal, boolean getIncremental) {
- if ((project == null) || (enabledVal == null) || (enabledVal.length == 0)) {
- return Collections.EMPTY_SET;
- }
-
- Set val = new HashSet();
- 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 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getEnabledValidators" + 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);
- }
- }
- return Collections.EMPTY_SET;
- }
- }
-
- private ValidatorMetaData[] getStateOfProjectLevelValidatorsFromGlobal(ProjectConfiguration prjp) throws InvocationTargetException {
- List enabledGlobalValidatorsForProject = new ArrayList();
- GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
- List allProjectValidator = getAllValidatorUniqueNames(prjp.getValidators());
- ValidatorMetaData[] vmd = gf.getBuildEnabledValidators();
- for(int i = 0; i < vmd.length; i++) {
- if(allProjectValidator.contains(vmd[i].getValidatorUniqueName())) {
- enabledGlobalValidatorsForProject.add(vmd[i]);
- }
- }
- return (ValidatorMetaData[]) enabledGlobalValidatorsForProject.toArray(new ValidatorMetaData[enabledGlobalValidatorsForProject.size()]);
- }
-
- private List getAllValidatorUniqueNames(ValidatorMetaData[] metaData) {
- List names = new ArrayList();
- for(int i = 0; i < metaData.length; i++) {
- names.add(metaData[i].getValidatorUniqueName());
- }
- return names;
- }
-
-
-
- protected Set getManualEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getManualEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getEnabledValidators" + 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);
- }
- }
- return Collections.EMPTY_SET;
- }
- }
-
- protected Set getBuildEnabledValidators(IProject project) {
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- ValidatorMetaData[] vmds = prjp.getBuildEnabledValidators();
- return InternalValidatorManager.wrapInSet(vmds);
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::getEnabledValidators" + 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.updateTaskList(" + 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);
- }
- }
- }
- }
-
-
- 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 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.isEnabled(" + project.getName() + ", " + validatorName + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::isEnabled" + 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);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager::numberProjectEnabledValidators" + 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);
- }
- }
- return 0;
- }
- }
-
-
- /**
- * Suspends, or undoes the suspension of, validation on the current project. If "suspend" is
- * true then validation is suspended and if it's "false" then validation will run on the
- * project. The value of this variable is not persisted.
- *
- * Be VERY CAREFUL 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 unsuspend validation.
- * The user will have to shut down & restart WSAD to get validation to work again.
- *
- * If an operation is used to make changes that should not be validated, then use the technique
- * documented in the "Preventing Validation" topic of the "Validation Guide" (in the
- * org.eclipse.wst.validation.internal.provisional.core.core.prop plugin). If you don't, validation may not be suspended.
- */
- public void suspendValidation(IProject project, boolean suspend) {
- if (project == null) {
- return;
- }
-
- if (!project.exists()) {
- return;
- }
-
- // Ignore whether or not the project is closed. If it's closed then it will not be built
- // and the "Run Validation" option will not be available.
- if (suspend) {
- _suspendedProjects.add(project);
- } else {
- _suspendedProjects.remove(project);
- }
- }
-
- /**
- * 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 will run.
- * The value of this variable is not persisted.
- *
- * Be VERY CAREFUL 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 unsuspend validation.
- * The user will have to shut down & restart WSAD to get validation to work again.
- *
- * If an operation is used to make changes that should not be validated, then use the technique
- * documented in the "Preventing Validation" topic of the "Validation Guide" (in the
- * org.eclipse.wst.validation.internal.provisional.core.core.prop plugin). If you don't, validation may not be suspended.
- */
- 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 (project == null) {
- return false;
- }
-
- if (_suspendAllValidation) {
- return true;
- }
-
- return _suspendedProjects.contains(project);
- }
-
- /**
- * This method should be called by any code that is preparing to suspend validation on a
- * project. Rather than calling isSuspsend(IProject), which will return true if all validation
- * has been suspended, this method returns the state of the project itself. See the
- * ValidationMigrator::migrateProject for an example.
- *
- * @param project
- * @return boolean
- */
- public boolean isProjectSuspended(IProject project) {
- if (project == null) {
- return false;
- }
-
- return _suspendedProjects.contains(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 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidatorManager.setEnabledValidators(" + project.getName() + ", Set, IProgressMonitor)"); //$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);
- }
- }
- }
- }
-
- public static void setResourceUtilClass(Class clazz) {
- _resourceUtilClass = clazz;
- }
-
- /**
- * This method is for use by batch EJB deploy only. Only in batch mode is an infinitie 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidatorManager.removeMessageLimitExceeded(" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- 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){
- ArrayList list = (ArrayList) validatorMsgs.get(validator);
- if( list == null ){
- list = new ArrayList();
- validatorMsgs.put(validator, list);
- }
- list.add(info);
- }
-
- public ArrayList getMessages(IValidatorJob validator){
- ArrayList list = (ArrayList) validatorMsgs.get(validator);
- if( list == null )
- list = new ArrayList();
- return list;
- }
-
- public void clearMessages(IValidatorJob validator){
- ArrayList list = (ArrayList) validatorMsgs.get(validator);
- if( list != null ){
- list.clear();
- }
- validatorMsgs.remove( validator );
- }
-
-
- public Set 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 d80a789..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
+++ /dev/null
@@ -1,336 +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.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 {
- protected static final String DEFAULT_DEFAULTEXTENSION = null; // By default, assume that there
-
- // is no default fallback
- // extension
-
- /**
- * 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);
-
- boolean filterIn = false; // force the resources to be filtered in even if the validator
- // doesn't normally take them?
- ValidatorMetaData[] vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, fileExtension); // return
- // 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.
- 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));
-
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, filterIn)); // construct
- // an
- // array
- // of
- // IFileDelta[]
- // to
- // wrap
- // the
- // Object[];
- // one
- // IFileDelta
- // for
- // each
- // Object
- // in
- // the
- // array
- }
-
- /**
- * 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 tempSet = new HashSet();
- 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 iterator = tempSet.iterator();
- while (iterator.hasNext()) {
- IProject p = (IProject) 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 enabled = new HashSet();
- for (int i = 0; i < validatorNames.length; i++) {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorNames[i]);
- if (vmd == null) {
- // No validator, with that plugin 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(validatorNames[i]);
- }
- 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 11ca168..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
+++ /dev/null
@@ -1,788 +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.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 java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-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 _modelRegistry;
- private int _ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
- public List 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();
-
- 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 exc) {
- foundResource = null;
-
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::getContainerRelativePath(IResource, IContainer)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext.getLineNo(Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::getMethod(String, Class[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 getFiles(String validatorClassName)
- {
- IProject project = getProject();
- List files = new ArrayList();
- 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 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(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 = (Method) _modelRegistry.get(symbolicName);
- if (loader == null) {
- return null;
- }
-
- return loader.invoke(this, parms);
- } catch (IllegalAccessException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::loadModel(String, Object[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return null;
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::loadModel(String, Object[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc.getTargetException());
- logger.write(Level.SEVERE, exc);
- }
- }
- return null;
- } catch (NullPointerException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::loadModel(String, Object[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return null;
- } catch (ExceptionInInitializerError exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchContext::loadModel(String, Object[])"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- StringBuffer buffer = new StringBuffer("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$
-
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("ValidationRegistryReader.readExtension(IExtension)"); //$NON-NLS-1$
- entry.setText(buffer.toString());
- logger.write(Level.FINE, entry);
- }
- } 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) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String[] getURIs() {
- String[] uris = new String[validationFileURIs.size()];
- for(int i = 0; i < validationFileURIs.size(); i++)
- uris[i] = (String) validationFileURIs.get(i);
- return uris;
- }
-
- /**
- * @return Returns the validationFileURIs.
- */
- public List getValidationFileURIs() {
- return validationFileURIs;
- }
-
- /**
- * @param validationFileURIs The validationFileURIs to set.
- */
- public void setValidationFileURIs(List 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 a149a69..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
+++ /dev/null
@@ -1,741 +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.text.MessageFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-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.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.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. The WorkbenchReporter class will be moved in Milestone
- * 4.
- *
- * This class handles interaction between the user and the IValidator in the eclipse workbench
- * environment.
- *
- * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
- * resource deltas can be generated by the methods in this class.
- *
- * Only the validation framework may instantiate or alter instances of this class.
- */
-
-public final 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); // null ClassLoader = use the default
- // (clazz.getClassLoader());
- }
-
- 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); // null = use the
- // default
- // ClassLoader
- // (class.getClassLoader())
- }
-
- public static void addMessage(IResource resource, Class clazz, IMessage message, String targetObjectName, String location,String markerId) {
- addMessage(resource, clazz, null, message, targetObjectName, location,markerId); // null = use the
- // default
- // ClassLoader
- // (class.getClassLoader())
- }
-
-
-
- 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 exc) {
- // Couldn't add the task to the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.addMessage(Class,, IResource, IMessage, String, String"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- 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 exc) {
- // Couldn't add the task to the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.addMessage(Class,, IResource, IMessage, String, String"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
-
-
- 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 exc) {
- // Couldn't remove the task from the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.removeAllMessages(String[], IResource, String)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- /**
- * @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 exc) {
- // Remove the vmd from the reader's list
- ValidationRegistryReader.getReader().disableValidator(vmd);
-
- // Log the reason for the disabled validator
- final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::removeAllMessages(IResource, IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- public static void removeAllMessages(IResource resource, String[] validatorNames, String targetObjectName) {
- try {
- TaskListUtility.removeAllTasks(resource, validatorNames, targetObjectName);
- } catch (CoreException exc) {
- // Couldn't remove the task from the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.removeAllMessages(String[], IResource, String)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- 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 exc) {
- // Couldn't remove the task to the task list for some reason...
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.removeMessageSubset(String[], IResource, String, String)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
-
- /**
- * 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 Logger getMsgLogger(IValidator validator) {
- ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
- if (vmd == null) {
- return ValidationPlugin.getPlugin().getMsgLogger();
- }
-
- return vmd.getMsgLogger();
- }
-
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.getLocationText(Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- 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 exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.getTargetObjectName(Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- 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 exc) {
- 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);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::getMessageResource(IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- } catch (IllegalArgumentException exc2) {
- // 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
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::getMessageResource(IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc2);
- logger.write(Level.SEVERE, entry);
- }
- }
- } catch (IllegalArgumentException exc) {
- // 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
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::getMessageResource(IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- } catch (Exception exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.getMessageResource(IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- 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 exc) {
- 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);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::addMessage(IValidator, IMessage)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return;
- } catch (IllegalArgumentException exc2) {
- logDisabledValidator(exc2);
- return;
- }
- } catch (IllegalArgumentException exc) {
- logDisabledValidator(exc);
- return;
- }
-
- if (resource == null) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter.addMessage(IValidator, Message)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INVALID_RESOURCE);
- String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_RESOURCE), new String[]{message.getText(), getTargetObjectName(helper, message)});
- entry.setText(result);
- //entry.setTokens(new String[]{message.getText(), getTargetObjectName(helper, message)});
- logger.write(Level.FINE, entry);
- }
- 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("."));
- String qualifiedMessageMarkerId = null;
- if (messageMarkerId.indexOf(pluginQualifier) == -1)
- qualifiedMessageMarkerId = pluginQualifier + "." + messageMarkerId;
- else
- qualifiedMessageMarkerId = messageMarkerId;
- if (Arrays.asList(vmd.getMarkerIds()).contains(qualifiedMessageMarkerId))
- return qualifiedMessageMarkerId;
- }
- }
- }
- return null;
- }
-
- private void logDisabledValidator(IllegalArgumentException exc) {
- // 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
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::addMessage(IValidator, IMessage)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- 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 exc) {
- // 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);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::removeAllMessages(IResource, IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
-
- 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 exc) {
- // 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);
-
- // Log the reason for the disabled validator
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceID("WorkbenchReporter::removeAllMessages(IResource, IValidator, Object)"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
-
- 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 = null;
- if (cl == null) {
- cl = clazz.getClassLoader();
- }
- String text = message.getText(cl);
- MessageInfo msgInfo = new MessageInfo(getUniqueId(clazz), resource, location,
- text, targetObjectName, markerId, message );
-
- ValidatorManager mgr = ValidatorManager.getManager();
- mgr.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 dccd886..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
+++ /dev/null
@@ -1,71 +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.plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-
-public class ValidationHelperRegistryReader extends RegistryReader {
-
- /** 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 validationHelpers = null;
-
- public ValidationHelperRegistryReader() {
- super(ValidationPlugin.PLUGIN_ID, VALIDATION_HELPER);
- }
-
- public static ValidationHelperRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationHelperRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- private List getValidationHelpers() {
- if (validationHelpers == null)
- validationHelpers = new ArrayList();
- 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 (IProjectValidationHelper) 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 8240b9c..0000000
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
+++ /dev/null
@@ -1,162 +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.plugin;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.validation.internal.EventManager;
-import org.eclipse.wst.validation.internal.TimeEntry;
-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;
-
-public class ValidationPlugin extends WTPPlugin {
- public static final String VALIDATION_PROP_FILE_NAME = "validate_base"; //$NON-NLS-1$
- public static final String PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
- private static ValidationPlugin _plugin;
- private static TimeEntry _tEntry;
- private static LogEntry _entry;
- 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
-
- /**
- * ValidationPlugin constructor comment.
- *
- * @param descriptor
- * org.eclipse.core.runtime.IPluginDescriptor
- */
- public ValidationPlugin() {
- super();
- if (_plugin == null) {
- _plugin = this;
- //Commenting off the following lines the Plugin is not activated and the
- //getMsgLogger tries to access the Plugin and the plugin is in a active pending state.
- //getMsgLogger();
- //logger.log(Level.CONFIG, null);
-
- }
- }
-
- public static String getBundleName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static LogEntry getLogEntry() {
- if (_entry == null) {
- _entry = new LogEntry(VALIDATION_PROP_FILE_NAME);
- } else {
- _entry.reset();
- }
- // Always set the log entry's Locale before you use it
- // because the user can reset it on the fly.
- _entry.setLocaleOfOrigin(Locale.getDefault().toString());
- return _entry;
- }
-
- public static TimeEntry getTimeEntry() {
- if (_tEntry == null) {
- _tEntry = new TimeEntry();
- }
- _tEntry.reset();
- return _tEntry;
- }
-
- public static Message getMessage() {
- if (_message == null) {
- _message = new Message();
- _message.setBundleName(getBundleName());
- }
- // clear the message for reuse
- _message.setId(null);
- _message.setParams(null);
- _message.setTargetObject(null);
- _message.setGroupName(null);
- _message.setSeverity(IMessage.LOW_SEVERITY);
- return _message;
- }
-
- /**
- * Retrieves a hashtable of a logger's preferences initially from the
- * com.ibm.etools.logging.util.loggingDefaults extension point if specified in the
- * com.ibm.etools.logging.util plugin.xml file. If specified, the
- * com.ibm.etools.logging.util.loggingOptions extension point preferences in the parameter
- * plugin's plugin.xml file are returned.
- *
- * The logger's preferences are stored in the return hashtable using the static instance
- * variables in LoggerStateHashKeys as keys.
- *
- * @param plugin
- * the Plugin polled for their logger's preferences in the plugin.xml file
- * @return hashtable of a logger's preferences
- */
- /*
- * public Hashtable getMsgLoggerConfig(Plugin plugin) { return (new
- * PluginHelperImpl().getMsgLoggerConfig(plugin));
- */
- public static ValidationPlugin getPlugin() {
- return _plugin;
- }
-
- /**
- * Sets the logger's preferences based on values in the parameter hashtable.
- *
- * The logger's preferences are stored in the parameter hashtable using the static instance
- * variables in LoggerStateHashKeys as keys.
- *
- * @param msgLoggerConfig
- * hashtable of the logger's preferences
- */
- /*
- * public void setMsgLoggerConfig(Hashtable msgLoggerConfig) {
- * getMsgLogger().setMsgLoggerConfig(msgLoggerConfig); }
- */
- public static boolean isActivated() {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
- return false;
- }
-
- /**
- * @see Plugin#startup()
- */
- 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);
- }
-
- /**
- * @see org.eclipse.core.runtime.Plugin#stop(BundleContext context)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- ResourcesPlugin.getWorkspace().removeResourceChangeListener( EventManager.getManager() );
- EventManager.getManager().shutdown();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
-
-}
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 871fe72..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 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, 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();
- }
- messageAttributes.put(attributeName,value);
- }
-
- public HashMap 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 acb97eb..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
+++ /dev/null
@@ -1,129 +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.ArrayList;
-import java.util.Iterator;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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;
-
-/**
- * <p>
- * This singleton launches the validation on a single validator. Clients should call this class's
- * <code>start</code> method to begin the validation.
- * </p>
- */
-public class ValidatorLauncher {
- private static ValidatorLauncher _launcher;
-
- private ValidatorLauncher() {
- //Default constructor
- }
-
- /**
- * @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.
- *
- * <br>
- * <br>
- * 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.
- * @param changedFiles
- * Is an array of files which have been added, changed, or deleted
- * since the last validation. If <code>changedFiles</code> is null, or if it is an empty
- * array, then a full validation should be performed. Otherwise, validation on just the files
- * listed in the array should performed if the validator supports incremental validation.
- */
- 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 ArrayList 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.getTargetObjectName(),
- info.getMsg().getGroupName(), info.getMsg().getOffset(), info.getMsg().getLength());
-
- } catch (CoreException exc) {
- Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- 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 fea1a32..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
+++ /dev/null
@@ -1,348 +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 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.
- *
- * @plannedfor 1.0
- * </p>
- *
- * [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);
- * ]
- */
-public interface IMessage {
- 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;
-
- /**
- * @return the name of the bundle which this message is contained in.
- */
- String getBundleName();
-
- /**
- * <p>
- * 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.
- * </p>
- * @return the name of the group to which the message belongs.
- */
- String getGroupName();
-
- /**
- * <p>
- * 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.
- * </p>
- * @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();
-
- /**
- * <p>
- * 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.
- * </p>
- * @return line number of the location of the problem.
- *
- */
- int getLineNumber();
-
- /**
- * <p>
- * 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.)
- * </p>
- *
- * @return offset of the message
- */
- int getOffset();
-
- /**
- * <p>
- * Returns the parameters of the message. Message parameters are the values which are
- * substituted into parameter slots in localized message text ddscriptions.
- * </p>
- *
- * @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();
-
- /**
- * <p>
- * 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".
- * </p>
- *
- * @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. Basically
- * a convienince to pass object values around that can consumed by other Objects it they need it
- * @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);
-
- /**
- * <p>
- * 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.
- * </p>
- *
- * @param name
- * Name of the group.
- */
- void setGroupName(String name);
-
- /**
- * <p>
- * 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.
- * </p>
- *
- * @param newId
- * Id of the message.
- */
- void setId(String newId);
-
- /**
- * <p>
- * Sets the length of the problem, starting from the offset. If unset, value =
- * IMessage.OFFSET_UNSET.
- *
- * @see #setOffset(int)
- * </p>
- *
- * @param length
- * sets the length
- */
- void setLength(int length);
-
- /**
- * <p>
- * 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.
- * </p>
- * @param lineNumber
- * sets the line no.
- */
- void setLineNo(int lineNumber);
-
- /**
- * <p>
- * 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.)
- * </p>
- * @param offset
- * sets the offset of the message.
- */
- void setOffset(int offset);
-
- /**
- * <p>
- * Sets the parameters of the message. Message parameters are the values which are substituted
- * into parameter slots in localized message text descriptions.
- * </p>
- * <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,
- * </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);
-
- /**
- * <p>
- * 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.
- * </p>
- *
- * @param obj
- * The object that has the problem.
- */
- void setTargetObject(Object obj);
-
- /**
- * return all the attributes of a Message object
- * @return
- */
- 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 37a9cfe..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
+++ /dev/null
@@ -1,17 +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;
-
-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 95533db..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
+++ /dev/null
@@ -1,36 +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>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 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 2eb52bf..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
+++ /dev/null
@@ -1,161 +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 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.
- *
- * Reporter implementations should keep non-localized versions of their messages
- *
- * 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.
- *
- * 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.
- * ]
- */
-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
- * @exception MessageLimitException
- * is thrown when the total number of messages reported exceeds the maximum
- * allowed.
- * [issue: LM - This exception seems questionable to me. Why do validators need to know how
- * to handle a MessageLimitException? Seems to me that this is a validation framework
- * specific issue and that client validators shouldn't know about this at all. ]
- */
- abstract void addMessage(IValidator origin, IMessage message);
-
- /**
- * <p>
- * 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
- *
- * @see subTask(String name) in IProgressMonitor
- * </p>
- * <p>
- * Both parameters must not be null.
- * </p>
- *
- * @param IValidator
- * validator The validator issuing the subtask message.
- * @param IMessage
- * message The message to be displayed to the user.
- *
- */
- abstract void displaySubtask(IValidator validator, IMessage message);
-
- /**
- * @return the message access interface to this reporter, or null if message access is not
- * supported.
- *
- */
- List getMessages();
-
- /**
- * <p>
- * Return true if the user cancelled validation, and false otherwise. This method should be
- * called by IValidators periodically, because no event is fired to notify IValidators that the
- * user cancelled validation. If a validator does not check this method, a cancellation request
- * is ignored.
- * </p>
- *
- * @return true if the user cancelled validation, and false otherwise.
- *
- */
- abstract boolean isCancelled();
-
- /**
- * <p>
- * Remove all validation messages entered by the identified validator. This method is provided
- * for incremental validation.
- * </p>
- * <p>
- * The IValidator parameter must not be null.
- * </p>
- * @param origin
- * originator validator of the message.
- */
- abstract 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.
- *
- */
- abstract 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. <br>
- * <br>
- * <br>
- *
- * The IValidator parameter must not be null. <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.)
- *
- * If groupName is null, that's the same as no group (i.e., the same behaviour as the
- * <code>removeAllMessages(IValidator, Object)</code> method.) <br>
- *
- * @param origin
- * originator validator of the message.
- * @param object
- * 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 8a3a2e9..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.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.provisional.core;
-
-
-
-/**
- * <p>
- * 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>
- * <p>
- * The model is loaded differently depending on whether the validator is running in
- * UI or headless 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 headless and one for
- * UI. 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>
- */
-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
- * Headless and UI.
- *
- * 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.
- * @see <code>WorkbenchContext</code>
- *
- * </p>
- * @plannedfor 1.0
- */
- Object loadModel(String symbolicName);
-
- /**
- * <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 Headless and UI. 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 parms list of parameters that the model takes for invocation
- *
- * [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.]
- */
- 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 11d79e8..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
+++ /dev/null
@@ -1,71 +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. <br>
- * <br>
- * A validator can perform full validation or incremental validation. All validators must implement
- * full validation but incremental validation is optional. <br>
- * <br>
- * Each validator must not be tied to any particular workbench implementation. <br>
- * <br>
- * A validator's verification starts when the ValidatorLauncher singleton calls
- * <code>validate</code>.
- *
- * [issue: LM - This interface will be implemented by clients. This should be considered a candidate for
- * an abstract class. ]
- */
-public interface IValidator{
- /**
- * <p>
- * 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.
- * </p>
- * @param reporter used for the interaction with the user
- * @plannedfor WTP 1.0
- *
- * [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? ]
- */
- void cleanup(IReporter reporter);
-
- /**
- * This is the method which performs the validation on the objects. <br>
- * <br>
- * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * <br>
- * @param helper
- * loads an object.
- * @param reporter
- * Is an instance of an IReporter interface, which is used for
- * interaction with the user.
- * @param changedFiles
- * Is an array of files which have been added, changed, or deleted
- * since the last validation. If <code>changedFiles</code> is null, or if it is an empty
- * array, then a full validation should be performed. Otherwise, validation on just the files
- * listed in the array should performed if the validator supports incremental validation.
- *
- * [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?]
- */
- 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 c7d8a52..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
+++ /dev/null
@@ -1,54 +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 call <br/>
- * validator.getSchedulingRule(helper) <br/>
- * validator.validate(reporter)
- */
-
-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. <br>
- * <br>
- * <code>reporter</code> may not be null. <code>changedFiles</code>
- * may be null, if a full build is desired. <br>
- * <br>
- *
- * @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.
- * @return
- */
- 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 2362dd8..0000000
--- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
+++ /dev/null
@@ -1,29 +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;
-
-
-/**
- * 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.
- * [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. ]
- * @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/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/validationSelectionHandler.exsd b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
deleted file mode 100644
index acffbfa..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
+++ /dev/null
@@ -1,117 +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="validationSelectionHandler" name="Validation Selection Handler"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validationSelectionHandler" 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="validationSelectionHandler">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="handlerClass" 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>
-
- </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/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 faa0a2c..0000000
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ /dev/null
@@ -1,333 +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>
- </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>
